mirror/python
1
0
Fork 0
mirror of https://github.com/meshtastic/python.git synced 2026-04-25 17:40:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get configuration yaml working again

Browse Source
This commit is contained in:
Ben Meadors
2022-10-08 07:16:20 -05:00
parent 3c80fd0f02
commit 2a4816a9cd
2 changed files with 67 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
meshtastic/__main__.py
View File

@@ -411,19 +411,21 @@ def onConnected(interface):
interface.sendPosition(lat, lon, alt)
interface.localNode.writeConfig('position')
if 'user_prefs' in configuration:
if 'config' in configuration:
localConfig = interface.getNode(args.dest).localConfig
for pref in configuration['user_prefs']:
setPref(localConfig, pref, str(configuration['user_prefs'][pref]))
print("Writing modified preferences to device")
interface.getNode(args.dest).writeConfig()
if 'userPrefs' in configuration:
localConfig = interface.getNode(args.dest).localConfig
for pref in configuration['userPrefs']:
setPref(localConfig, pref, str(configuration['userPrefs'][pref]))
print("Writing modified preferences to device")
interface.getNode(args.dest).writeConfig()
for section in configuration['config']:
for pref in configuration['config'][section]:
setPref(localConfig, f"{section}.{pref}", str(configuration['config'][section][pref]))
interface.getNode(args.dest).writeConfig(section)
if 'module_config' in configuration:
moduleConfig = interface.getNode(args.dest).moduleConfig
for section in configuration['module_config']:
for pref in configuration['module_config'][section]:
setPref(moduleConfig, f"{section}.{pref}", str(configuration['module_config'][section][pref]))
interface.getNode(args.dest).writeConfig(section)
print("Writing modified configuration to device")
if args.export_config:
# export the configuration (the opposite of '--configure')
@@ -645,20 +647,32 @@ def export_config(interface):
configObj["channel_url"] = channel_url
if lat or lon or alt:
configObj["location"] = { "lat": lat, "lon": lon, "alt": alt }
preferences = MessageToDict(interface.localNode.localConfig)
if preferences:
config = MessageToDict(interface.localNode.localConfig)
if config:
# Convert inner keys to correct snake/camelCase
prefs = {}
for pref in preferences:
for pref in config:
if Globals.getInstance().get_camel_case():
prefs[meshtastic.util.snake_to_camel(pref)] = preferences[pref]
prefs[meshtastic.util.snake_to_camel(pref)] = config[pref]
else:
# TODO: Possibly convert camel to snake?
prefs[pref] = preferences[pref]
prefs[pref] = config[pref]
if Globals.getInstance().get_camel_case():
configObj["userPrefs"] = preferences
configObj["config"] = config
else:
configObj["user_prefs"] = preferences
configObj["config"] = config
module_config = MessageToDict(interface.localNode.moduleConfig)
if module_config:
# Convert inner keys to correct snake/camelCase
prefs = {}
for pref in module_config:
if len(module_config[pref]) > 0:
prefs[pref] = module_config[pref]
if Globals.getInstance().get_camel_case():
configObj["module_config"] = prefs
else:
configObj["module_config"] = prefs
config = "# start of Meshtastic configure yaml\n"
config += yaml.dump(configObj)