Merge pull request #350 from Douile/dev-base64-decode

Allow setting values from base64 values

.vscode/launch.json

@@ -68,6 +68,14 @@
       "justMyCode": true,
       "args": ["--debug", "--info"]
     },
+    {
+      "name": "meshtastic debug set region",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "args": ["--debug", "--set", "lora.region", "1"]
+    },
     {
       "name": "meshtastic debug setPref",
       "type": "python",
@@ -77,12 +85,20 @@
       "args": ["--debug", "--set", "power.is_power_saving", "1"]
     },
     {
-      "name": "meshtastic debug setPref telemetry",
+      "name": "meshtastic debug setPref telemetry.environment_measurement_enabled",
       "type": "python",
       "request": "launch",
       "module": "meshtastic",
       "justMyCode": true,
-      "args": ["--debug", "--set", "telemetry.environment_update_interval", "120"]
+      "args": ["--debug", "--set", "telemetry.environment_measurement_enabled", "1"]
+    },
+    {
+      "name": "meshtastic debug setPref telemetry.environment_screen_enabled",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "args": ["--debug", "--set", "telemetry.environment_screen_enabled", "1"]
     },
     {
       "name": "meshtastic debug setPref telemetry",

meshtastic/__main__.py

@@ -337,9 +337,9 @@ def onConnected(interface):
                 interface.getNode(args.dest).writeConfig()
             else:
                 if Globals.getInstance().get_camel_case():
-                        print(f"{localConfig.__class__.__name__} and {moduleConfig.__class__.__name__} do not have an attribute {pref[0]}.")
+                        print(f"{node.localConfig.__class__.__name__} and {node.moduleConfig.__class__.__name__} do not have an attribute {pref[0]}.")
                 else:
-                    print(f"{localConfig.__class__.__name__} and {moduleConfig.__class__.__name__} do not have attribute {pref[0]}.")
+                    print(f"{node.localConfig.__class__.__name__} and {node.moduleConfig.__class__.__name__} do not have attribute {pref[0]}.")
 
         if args.configure:
             with open(args.configure[0], encoding='utf8') as file:

meshtastic/node.py

@@ -92,85 +92,97 @@ class Node:
             p.set_config.device.CopyFrom(self.localConfig.device)
             self._sendAdmin(p)
             logging.debug("Wrote device")
+            time.sleep(0.1)
 
         if self.localConfig.position:
             p = admin_pb2.AdminMessage()
             p.set_config.position.CopyFrom(self.localConfig.position)
             self._sendAdmin(p)
             logging.debug("Wrote position")
+            time.sleep(0.1)
 
         if self.localConfig.power:
             p = admin_pb2.AdminMessage()
             p.set_config.power.CopyFrom(self.localConfig.power)
             self._sendAdmin(p)
             logging.debug("Wrote power")
+            time.sleep(0.1)
 
         if self.localConfig.wifi:
             p = admin_pb2.AdminMessage()
             p.set_config.wifi.CopyFrom(self.localConfig.wifi)
             self._sendAdmin(p)
             logging.debug("Wrote wifi")
+            time.sleep(0.1)
 
         if self.localConfig.display:
             p = admin_pb2.AdminMessage()
             p.set_config.display.CopyFrom(self.localConfig.display)
             self._sendAdmin(p)
             logging.debug("Wrote display")
+            time.sleep(0.1)
 
         if self.localConfig.lora:
             p = admin_pb2.AdminMessage()
             p.set_config.lora.CopyFrom(self.localConfig.lora)
             self._sendAdmin(p)
             logging.debug("Wrote lora")
+            time.sleep(0.1)
 
         if self.moduleConfig.mqtt:
             p = admin_pb2.AdminMessage()
             p.set_module_config.mqtt.CopyFrom(self.moduleConfig.mqtt)
             self._sendAdmin(p)
             logging.debug("Wrote module: mqtt")
+            time.sleep(0.1)
 
         if self.moduleConfig.serial:
             p = admin_pb2.AdminMessage()
             p.set_module_config.serial.CopyFrom(self.moduleConfig.serial)
             self._sendAdmin(p)
             logging.debug("Wrote module: serial")
+            time.sleep(0.1)
 
         if self.moduleConfig.external_notification:
             p = admin_pb2.AdminMessage()
             p.set_module_config.external_notification.CopyFrom(self.moduleConfig.external_notification)
             self._sendAdmin(p)
             logging.debug("Wrote module: external_notification")
+            time.sleep(0.1)
         
         if self.moduleConfig.store_forward:
             p = admin_pb2.AdminMessage()
             p.set_module_config.store_forward.CopyFrom(self.moduleConfig.store_forward)
             self._sendAdmin(p)
             logging.debug("Wrote module: store_forward")
+            time.sleep(0.1)
         
         if self.moduleConfig.range_test:
             p = admin_pb2.AdminMessage()
             p.set_module_config.range_test.CopyFrom(self.moduleConfig.range_test)
             self._sendAdmin(p)
             logging.debug("Wrote module: range_test")
+            time.sleep(0.1)
 
         if self.moduleConfig.telemetry:
             p = admin_pb2.AdminMessage()
             p.set_module_config.telemetry.CopyFrom(self.moduleConfig.telemetry)
             self._sendAdmin(p)
             logging.debug("Wrote module: telemetry")
+            time.sleep(0.1)
 
         if self.moduleConfig.canned_message:
             p = admin_pb2.AdminMessage()
             p.set_module_config.canned_message.CopyFrom(self.moduleConfig.canned_message)
             self._sendAdmin(p)
             logging.debug("Wrote module: canned_message")
+            time.sleep(0.1)
 
     def writeChannel(self, channelIndex, adminIndex=0):
         """Write the current (edited) channel to the device"""
 
         p = admin_pb2.AdminMessage()
         p.set_channel.CopyFrom(self.channels[channelIndex])
-
         self._sendAdmin(p, adminIndex=adminIndex)
         logging.debug(f"Wrote channel {channelIndex}")
 

meshtastic/util.py

@@ -64,6 +64,8 @@ def fromStr(valstr):
     elif valstr.startswith('0x'):
         # if needed convert to string with asBytes.decode('utf-8')
         val = bytes.fromhex(valstr[2:])
+    elif valstr.startswith('base64:'):
+        val = base64.b64decode(valstr[7:])
     elif valstr.lower() in {"t", "true", "yes"}:
         val = True
     elif valstr.lower() in {"f", "false", "no"}:

setup.py

@@ -12,7 +12,7 @@ with open("README.md", "r") as fh:
 # This call to setup() does all the work
 setup(
     name="meshtastic",
-    version="1.3alpha.18",
+    version="1.3alpha.20",
     description="Python API & client shell for talking to Meshtastic devices",
     long_description=long_description,
     long_description_content_type="text/markdown",