Merge pull request #354 from meshtastic/device-metadata

Add get device metadata admin message

.github/workflows/update_protobufs.yml

@@ -18,9 +18,9 @@ jobs:
           
       - name: Download nanopb
         run: |
-          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.4-linux-x86.tar.gz
-          tar xvzf nanopb-0.4.4-linux-x86.tar.gz
-          mv nanopb-0.4.4-linux-x86 nanopb-0.4.4
+          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.6-linux-x86.tar.gz
+          tar xvzf nanopb-0.4.6-linux-x86.tar.gz
+          mv nanopb-0.4.6-linux-x86 nanopb-0.4.6
           
       - name: Re-generate protocol buffers
         run: |

.vscode/launch.json

@@ -42,7 +42,71 @@
       "request": "launch",
       "module": "meshtastic",
       "justMyCode": true,
-      "args": ["--debug" ]
+      "args": ["--debug"]
+    },
+    {
+      "name": "meshtastic debug getPref",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "args": ["--debug", "--get", "power.is_power_saving"]
+    },
+    {
+      "name": "meshtastic debug getPref telemetry",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "args": ["--debug", "--get", "telemetry.environment_update_interval"]
+    },
+    {
+      "name": "meshtastic debug info",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "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",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "args": ["--debug", "--set", "power.is_power_saving", "1"]
+    },
+    {
+      "name": "meshtastic debug setPref telemetry.environment_measurement_enabled",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "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",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "args": ["--debug", "--set", "telemetry.environment_measurement_enabled", "1"]
     },
     {
       "name": "meshtastic setpref",
@@ -92,7 +156,7 @@
       "module": "meshtastic",
       "justMyCode": true,
       "args": ["--debug", "--sendtext", "pytest"]
-    }
+    },
     {
       "name": "meshtastic showNodes",
       "type": "python",

TODO.md

@@ -34,7 +34,7 @@ Basic functionality is complete now.
 - DONE add fromId and toId to received messages dictionaries
 - make command line options for displaying/changing config
 - update nodedb as nodes change
-- radioConfig - getter/setter syntax: https://www.python-course.eu/python3_properties.php
+- localConfig - getter/setter syntax: https://www.python-course.eu/python3_properties.php
 - let user change radio params via commandline options
 - keep nodedb up-to-date based on received MeshPackets
 - handle radio reboots and redownload db when that happens. Look for a special FromRadio.rebooted packet

meshtastic/__init__.py

@@ -7,7 +7,7 @@ Source code on [github](https://github.com/meshtastic/Meshtastic-python)
 
 properties of SerialInterface:
 
-- radioConfig - Current radio configuration and device settings, if you write to this the new settings will be applied to
+- localConfig - Current radio configuration and device settings, if you write to this the new settings will be applied to
 the device.
 - nodes - The database of received nodes.  Includes always up-to-date location and username information for each
 node in the mesh.  This is a read-only datastructure.

meshtastic/__main__.py

@@ -12,6 +12,7 @@ import yaml
 from pubsub import pub
 import pyqrcode
 import pkg_resources
+from google.protobuf.json_format import MessageToDict
 import meshtastic.util
 import meshtastic.test
 from meshtastic import remote_hardware
@@ -52,78 +53,73 @@ def onConnection(interface, topic=pub.AUTO_TOPIC): # pylint: disable=W0613
     print(f"Connection changed: {topic.getName()}")
 
 
-def getPref(attributes, name):
+def getPref(config, comp_name):
     """Get a channel or preferences value"""
 
-    camel_name = meshtastic.util.snake_to_camel(name)
+    name = splitCompoundName(comp_name)
+
+    camel_name = meshtastic.util.snake_to_camel(name[1])
     # Note: protobufs has the keys in snake_case, so snake internally
-    snake_name = meshtastic.util.camel_to_snake(name)
+    snake_name = meshtastic.util.camel_to_snake(name[1])
     logging.debug(f'snake_name:{snake_name} camel_name:{camel_name}')
     logging.debug(f'use camel:{Globals.getInstance().get_camel_case()}')
 
-    objDesc = attributes.DESCRIPTOR
-    field = objDesc.fields_by_name.get(snake_name)
-    if not field:
-        if Globals.getInstance().get_camel_case():
-            print(f"{attributes.__class__.__name__} does not have an attribute called {camel_name}, so you can not get it.")
-        else:
-            print(f"{attributes.__class__.__name__} does not have an attribute called {snake_name}, so you can not get it.")
-        print(f"Choices in sorted order are:")
-        names = []
-        for f in objDesc.fields:
-            tmp_name = f'{f.name}'
-            if Globals.getInstance().get_camel_case():
-                tmp_name = meshtastic.util.snake_to_camel(tmp_name)
-            names.append(tmp_name)
-        for temp_name in sorted(names):
-            print(f"    {temp_name}")
-        return
+    objDesc = config.DESCRIPTOR
+    config_type = objDesc.fields_by_name.get(name[0])
+    pref = False
+    if config_type:
+        pref = config_type.message_type.fields_by_name.get(snake_name)
+
+    if (not pref) or (not config_type):
+        return False
 
     # read the value
-    val = getattr(attributes, snake_name)
+    config_values = getattr(config, config_type.name)
+    pref_value = getattr(config_values, pref.name)
 
     if Globals.getInstance().get_camel_case():
-        print(f"{camel_name}: {str(val)}")
-        logging.debug(f"{camel_name}: {str(val)}")
+        print(f"{str(config_type.name)}.{camel_name}: {str(pref_value)}")
+        logging.debug(f"{str(config_type.name)}.{camel_name}: {str(pref_value)}")
     else:
-        print(f"{snake_name}: {str(val)}")
-        logging.debug(f"{snake_name}: {str(val)}")
+        print(f"{str(config_type.name)}.{snake_name}: {str(pref_value)}")
+        logging.debug(f"{str(config_type.name)}.{snake_name}: {str(pref_value)}")
+    return True
 
+def splitCompoundName(comp_name):
+    """Split compound (dot separated) preference name into parts"""
+    name = comp_name.split(".",1)
+    if len(name) != 2:
+        name[0]=comp_name
+        name.append(comp_name)
+    return name
 
-def setPref(attributes, name, valStr):
+def setPref(config, comp_name, valStr):
     """Set a channel or preferences value"""
 
-    snake_name = meshtastic.util.camel_to_snake(name)
-    camel_name = meshtastic.util.snake_to_camel(name)
+    name = splitCompoundName(comp_name)
+
+    snake_name = meshtastic.util.camel_to_snake(name[1])
+    camel_name = meshtastic.util.snake_to_camel(name[1])
     logging.debug(f'snake_name:{snake_name}')
     logging.debug(f'camel_name:{camel_name}')
 
-    objDesc = attributes.DESCRIPTOR
-    field = objDesc.fields_by_name.get(snake_name)
-    if not field:
-        if Globals.getInstance().get_camel_case():
-            print(f"{attributes.__class__.__name__} does not have an attribute called {camel_name}, so you can not set it.")
-        else:
-            print(f"{attributes.__class__.__name__} does not have an attribute called {snake_name}, so you can not set it.")
-        print(f"Choices in sorted order are:")
-        names = []
-        for f in objDesc.fields:
-            tmp_name = f'{f.name}'
-            if Globals.getInstance().get_camel_case():
-                tmp_name = meshtastic.util.snake_to_camel(tmp_name)
-            names.append(tmp_name)
-        for temp_name in sorted(names):
-            print(f"    {temp_name}")
-        return
+    objDesc = config.DESCRIPTOR
+    config_type = objDesc.fields_by_name.get(name[0])
+    pref = False
+    if config_type:
+        pref = config_type.message_type.fields_by_name.get(snake_name)
+
+    if (not pref) or (not config_type):
+        return False
 
     val = meshtastic.util.fromStr(valStr)
     logging.debug(f'valStr:{valStr} val:{val}')
 
-    if snake_name == 'wifi_password' and len(valStr) < 8:
-        print(f"Warning: wifi_password must be 8 or more characters.")
-        return
+    if snake_name == 'psk' and len(valStr) < 8:
+        print(f"Warning: wifi.psk must be 8 or more characters.")
+        return False
 
-    enumType = field.enum_type
+    enumType = pref.enum_type
     # pylint: disable=C0123
     if enumType and type(val) == str:
         # We've failed so far to convert this string into an enum, try to find it by reflection
@@ -132,9 +128,9 @@ def setPref(attributes, name, valStr):
             val = e.number
         else:
             if Globals.getInstance().get_camel_case():
-                print(f"{camel_name} does not have an enum called {val}, so you can not set it.")
+                print(f"{name[0]}.{camel_name} does not have an enum called {val}, so you can not set it.")
             else:
-                print(f"{snake_name} does not have an enum called {val}, so you can not set it.")
+                print(f"{name[0]}.{snake_name} does not have an enum called {val}, so you can not set it.")
             print(f"Choices in sorted order are:")
             names = []
             for f in enumType.values:
@@ -142,28 +138,32 @@ def setPref(attributes, name, valStr):
                 names.append(f'{f.name}')
             for temp_name in sorted(names):
                 print(f"    {temp_name}")
-            return
+            return False
 
     # note: 'ignore_incoming' is a repeating field
     if snake_name != 'ignore_incoming':
         try:
-            setattr(attributes, snake_name, val)
+            config_values = getattr(config, config_type.name)
+            setattr(config_values, pref.name, val)
         except TypeError:
             # The setter didn't like our arg type guess try again as a string
-            setattr(attributes, snake_name, valStr)
+            config_values = getattr(config, config_type.name)
+            setattr(config_values, pref.name, valStr)
     else:
         if val == 0:
             # clear values
             print("Clearing ignore_incoming list")
-            del attributes.ignore_incoming[:]
+            del config_type.message_type.ignore_incoming[:]
         else:
             print(f"Adding '{val}' to the ignore_incoming list")
-            attributes.ignore_incoming.extend([val])
+            config_type.message_type.ignore_incoming.extend([val])
 
     if Globals.getInstance().get_camel_case():
-        print(f"Set {camel_name} to {valStr}")
+        print(f"Set {name[0]}.{camel_name} to {valStr}")
     else:
-        print(f"Set {snake_name} to {valStr}")
+        print(f"Set {name[0]}.{snake_name} to {valStr}")
+
+    return True
 
 
 def onConnected(interface):
@@ -183,18 +183,18 @@ def onConnected(interface):
             alt = 0
             lat = 0.0
             lon = 0.0
-            prefs = interface.localNode.radioConfig.preferences
+            localConfig = interface.localNode.localConfig
             if args.setalt:
                 alt = int(args.setalt)
-                prefs.fixed_position = True
+                localConfig.fixed_position = True
                 print(f"Fixing altitude at {alt} meters")
             if args.setlat:
                 lat = float(args.setlat)
-                prefs.fixed_position = True
+                localConfig.fixed_position = True
                 print(f"Fixing latitude at {lat} degrees")
             if args.setlon:
                 lon = float(args.setlon)
-                prefs.fixed_position = True
+                localConfig.fixed_position = True
                 print(f"Fixing longitude at {lon} degrees")
 
             print("Setting device position")
@@ -224,7 +224,7 @@ def onConnected(interface):
         if args.pos_fields:
             # If --pos-fields invoked with args, set position fields
             closeNow = True
-            prefs = interface.getNode(args.dest).radioConfig.preferences
+            localConfig = interface.getNode(args.dest).localConfig
             allFields = 0
 
             try:
@@ -239,34 +239,21 @@ def onConnected(interface):
 
             else:
                 print(f"Setting position fields to {allFields}")
-                setPref(prefs, 'position_flags', f'{allFields:d}')
+                setPref(localConfig, 'position_flags', f'{allFields:d}')
                 print("Writing modified preferences to device")
                 interface.getNode(args.dest).writeConfig()
 
         elif args.pos_fields is not None:
             # If --pos-fields invoked without args, read and display current value
             closeNow = True
-            prefs = interface.getNode(args.dest).radioConfig.preferences
+            localConfig = interface.getNode(args.dest).localConfig
 
             fieldNames = []
             for bit in config_pb2.PositionFlags.values():
-                if prefs.position_flags & bit:
+                if localConfig.position_flags & bit:
                     fieldNames.append(config_pb2.PositionFlags.Name(bit))
             print(' '.join(fieldNames))
 
-        if args.set_team:
-            closeNow = True
-            try:
-                v_team = meshtastic.mesh_pb2.Team.Value(args.set_team.upper())
-            except ValueError:
-                v_team = 0
-                print(f"ERROR: Team \'{args.set_team}\' not found.")
-                print("Try a team name from the sorted list below, or use 'CLEAR' for unaffiliated:")
-                print(sorted(meshtastic.mesh_pb2.Team.keys()))
-            else:
-                print(f"Setting team to {meshtastic.mesh_pb2.Team.Name(v_team)}")
-                interface.getNode(args.dest).setOwner(team=v_team)
-
         if args.set_ham:
             closeNow = True
             print(f"Setting Ham ID to {args.set_ham} and turning off encryption")
@@ -281,6 +268,10 @@ def onConnected(interface):
         if args.shutdown:
             closeNow = True
             interface.getNode(args.dest).shutdown()
+        
+        if args.device_metadata:
+            closeNow = True
+            interface.getNode(args.dest).getMetadata()
 
         if args.sendtext:
             closeNow = True
@@ -339,14 +330,23 @@ def onConnected(interface):
         # handle settings
         if args.set:
             closeNow = True
-            prefs = interface.getNode(args.dest).radioConfig.preferences
+            node = interface.getNode(args.dest)
 
             # Handle the int/float/bool arguments
+            pref = None
             for pref in args.set:
-                setPref(prefs, pref[0], pref[1])
+                found = setPref(node.localConfig, pref[0], pref[1])
+                if not found:
+                    found = setPref(node.moduleConfig, pref[0],  pref[1])
 
-            print("Writing modified preferences to device")
-            interface.getNode(args.dest).writeConfig()
+            if found:
+                print("Writing modified preferences to device")
+                interface.getNode(args.dest).writeConfig()
+            else:
+                if Globals.getInstance().get_camel_case():
+                    print(f"{node.localConfig.__class__.__name__} and {node.moduleConfig.__class__.__name__} do not have an attribute {pref[0]}.")
+                else:
+                    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:
@@ -377,35 +377,35 @@ def onConnected(interface):
                     alt = 0
                     lat = 0.0
                     lon = 0.0
-                    prefs = interface.localNode.radioConfig.preferences
+                    localConfig = interface.localNode.localConfig
 
                     if 'alt' in configuration['location']:
                         alt = int(configuration['location']['alt'])
-                        prefs.fixed_position = True
+                        localConfig.fixed_position = True
                         print(f"Fixing altitude at {alt} meters")
                     if 'lat' in configuration['location']:
                         lat = float(configuration['location']['lat'])
-                        prefs.fixed_position = True
+                        localConfig.fixed_position = True
                         print(f"Fixing latitude at {lat} degrees")
                     if 'lon' in configuration['location']:
                         lon = float(configuration['location']['lon'])
-                        prefs.fixed_position = True
+                        localConfig.fixed_position = True
                         print(f"Fixing longitude at {lon} degrees")
                     print("Setting device position")
                     interface.sendPosition(lat, lon, alt)
                     interface.localNode.writeConfig()
 
                 if 'user_prefs' in configuration:
-                    prefs = interface.getNode(args.dest).radioConfig.preferences
+                    localConfig = interface.getNode(args.dest).localConfig
                     for pref in configuration['user_prefs']:
-                        setPref(prefs, pref, str(configuration['user_prefs'][pref]))
+                        setPref(localConfig, pref, str(configuration['user_prefs'][pref]))
                     print("Writing modified preferences to device")
                     interface.getNode(args.dest).writeConfig()
 
                 if 'userPrefs' in configuration:
-                    prefs = interface.getNode(args.dest).radioConfig.preferences
+                    localConfig = interface.getNode(args.dest).localConfig
                     for pref in configuration['userPrefs']:
-                        setPref(prefs, pref, str(configuration['userPrefs'][pref]))
+                        setPref(localConfig, pref, str(configuration['userPrefs'][pref]))
                     print("Writing modified preferences to device")
                     interface.getNode(args.dest).writeConfig()
 
@@ -454,69 +454,56 @@ def onConnected(interface):
                     print(f"Deleting channel {channelIndex}")
                     ch = interface.getNode(args.dest).deleteChannel(channelIndex)
 
-        ch_changes = [args.ch_vlongslow, args.ch_longslow, args.ch_longfast,
-                      args.ch_midslow, args.ch_midfast,
-                      args.ch_shortslow, args.ch_shortfast]
-        any_primary_channel_changes = any(x for x in ch_changes)
-        if args.ch_set or any_primary_channel_changes or args.ch_enable or args.ch_disable:
+        def setSimpleConfig(modem_preset):
+            """Set one of the simple modem_config"""
+            # Completely new radio settings
+            chs = config_pb2.Config.LoRaConfig()
+            chs.modem_preset = modem_preset
+            prefs = interface.getNode(args.dest).localConfig
+            prefs.lora.CopyFrom(chs)
+            interface.getNode(args.dest).writeConfig()
+
+        # handle the simple radio set commands
+        if args.ch_vlongslow:
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.VLongSlow)
+
+        if args.ch_longslow:
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LongSlow)
+
+        if args.ch_longfast:
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LongFast)
+
+        if args.ch_midslow:
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MidSlow)
+
+        if args.ch_midfast:
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MidFast)
+
+        if args.ch_shortslow:
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.ShortSlow)
+
+        if args.ch_shortfast:
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.ShortFast)
+
+        if args.ch_set or args.ch_enable or args.ch_disable:
             closeNow = True
 
             channelIndex = our_globals.get_channel_index()
             if channelIndex is None:
-                if any_primary_channel_changes:
-                    # we assume that they want the primary channel if they're setting range values
-                    channelIndex = 0
-                else:
-                    meshtastic.util.our_exit("Warning: Need to specify '--ch-index'.", 1)
+                meshtastic.util.our_exit("Warning: Need to specify '--ch-index'.", 1)
             ch = interface.getNode(args.dest).channels[channelIndex]
 
-            if any_primary_channel_changes or args.ch_enable or args.ch_disable:
+            if args.ch_enable or args.ch_disable:
 
-                if channelIndex == 0 and not any_primary_channel_changes:
+                if channelIndex == 0:
                     meshtastic.util.our_exit("Warning: Cannot enable/disable PRIMARY channel.")
 
-                if channelIndex != 0:
-                    if any_primary_channel_changes:
-                        meshtastic.util.our_exit("Warning: Standard channel settings can only be applied to the PRIMARY channel")
-
                 enable = True  # default to enable
                 if args.ch_enable:
                     enable = True
                 if args.ch_disable:
                     enable = False
 
-                def setSimpleChannel(modem_config):
-                    """Set one of the simple modem_config only based channels"""
-
-                    # Completely new channel settings
-                    chs = channel_pb2.ChannelSettings()
-                    chs.modem_config = modem_config
-                    chs.psk = bytes([1])  # Use default channel psk 1
-
-                    ch.settings.CopyFrom(chs)
-
-                # handle the simple channel set commands
-                if args.ch_vlongslow:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.VLongSlow)
-
-                if args.ch_longslow:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.LongSlow)
-
-                if args.ch_longfast:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.LongFast)
-
-                if args.ch_midslow:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.MidSlow)
-
-                if args.ch_midfast:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.MidFast)
-
-                if args.ch_shortslow:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.ShortSlow)
-
-                if args.ch_shortfast:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.ShortFast)
-
             # Handle the channel settings
             for pref in (args.ch_set or []):
                 if pref[0] == "psk":
@@ -552,11 +539,20 @@ def onConnected(interface):
 
         if args.get:
             closeNow = True
-            prefs = interface.getNode(args.dest).radioConfig.preferences
+            localConfig = interface.getNode(args.dest).localConfig
+            moduleConfig = interface.getNode(args.dest).moduleConfig
 
             # Handle the int/float/bool arguments
             for pref in args.get:
-                getPref(prefs, pref[0])
+                found = getPref(localConfig, pref[0])
+                if not found:
+                    found = getPref(moduleConfig, pref[0])
+
+            if not found:
+                if Globals.getInstance().get_camel_case():
+                    print(f"{localConfig.__class__.__name__} and {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("Completed getting preferences")
 
@@ -609,6 +605,8 @@ def subscribe():
 
 def export_config(interface):
     """used in--export-config"""
+    configObj = {}
+
     owner = interface.getLongName()
     owner_short = interface.getShortName()
     channel_url = interface.localNode.getURL()
@@ -622,38 +620,34 @@ def export_config(interface):
         lon = pos.get('longitude')
         alt = pos.get('altitude')
 
-    config = "# start of Meshtastic configure yaml\n"
     if owner:
-        config += f"owner: {owner}\n\n"
+        configObj["owner"] = owner
     if owner_short:
-        config += f"owner_short: {owner_short}\n\n"
+        configObj["owner_short"] = owner_short
     if channel_url:
         if Globals.getInstance().get_camel_case():
-            config += f"channelUrl: {channel_url}\n\n"
+            configObj["channelUrl"] = channel_url
         else:
-            config += f"channel_url: {channel_url}\n\n"
+            configObj["channel_url"] = channel_url
     if lat or lon or alt:
-        config += "location:\n"
-        if lat:
-            config += f"  lat: {lat}\n"
-        if lon:
-            config += f"  lon: {lon}\n"
-        if alt:
-            config += f"  alt: {alt}\n"
-        config += "\n"
-    preferences = f'{interface.localNode.radioConfig.preferences}'
-    prefs = preferences.splitlines()
-    if prefs:
-        if Globals.getInstance().get_camel_case():
-            config += "userPrefs:\n"
-        else:
-            config += "user_prefs:\n"
-        for pref in prefs:
+        configObj["location"] = { "lat": lat, "lon": lon, "alt": alt }
+    preferences = MessageToDict(interface.localNode.localConfig)
+    if preferences:
+        # Convert inner keys to correct snake/camelCase
+        prefs = {}
+        for pref in preferences:
             if Globals.getInstance().get_camel_case():
-                # Note: This may not work if the value has '_'
-                config += f"  {meshtastic.util.snake_to_camel(meshtastic.util.quoteBooleans(pref))}\n"
+                prefs[meshtastic.util.snake_to_camel(pref)] = preferences[pref]
             else:
-                config += f"  {meshtastic.util.quoteBooleans(pref)}\n"
+                # TODO: Possibly convert camel to snake?
+                prefs[pref] = preferences[pref]
+        if Globals.getInstance().get_camel_case():
+            configObj["userPrefs"] = preferences
+        else:
+            configObj["user_prefs"] = preferences
+
+    config = "# start of Meshtastic configure yaml\n"
+    config += yaml.dump(configObj)
     print(config)
     return config
 
@@ -849,9 +843,6 @@ def initParser():
     parser.add_argument(
         "--set-owner-short", help="Set device owner short name", action="store")
 
-    parser.add_argument(
-        "--set-team", help="Set team affiliation (an invalid team will list valid values)", action="store")
-
     parser.add_argument(
         "--set-ham", help="Set licensed Ham ID and turn off encryption", action="store")
 
@@ -870,6 +861,9 @@ def initParser():
     parser.add_argument(
         "--shutdown", help="Tell the destination node to shutdown", action="store_true")
 
+    parser.add_argument(
+        "--device-metadata", help="Get the device metadata from the node", action="store_true")
+
     parser.add_argument(
         "--reply", help="Reply to received messages",
         action="store_true")
@@ -913,13 +907,6 @@ def initParser():
     parser.add_argument("--noproto", help="Don't start the API, just function as a dumb serial terminal.",
                         action="store_true")
 
-    parser.add_argument('--setchan', dest='deprecated', nargs=2, action='append',
-                        help='Deprecated, use "--ch-set param value" instead')
-    parser.add_argument('--set-router', dest='deprecated',
-                        action='store_true', help='Deprecated, use "--set is_router true" instead')
-    parser.add_argument('--unset-router', dest='deprecated',
-                        action='store_false', help='Deprecated, use "--set is_router false" instead')
-
     have_tunnel = platform.system() == 'Linux'
     if have_tunnel:
         parser.add_argument('--tunnel', action='store_true',

meshtastic/admin_pb2.py

@@ -14,11 +14,12 @@ _sym_db = _symbol_database.Default()
 
 from . import channel_pb2 as channel__pb2
 from . import config_pb2 as config__pb2
+from . import device_metadata_pb2 as device__metadata__pb2
 from . import mesh_pb2 as mesh__pb2
 from . import module_config_pb2 as module__config__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0b\x61\x64min.proto\x1a\rchannel.proto\x1a\x0c\x63onfig.proto\x1a\nmesh.proto\x1a\x13module_config.proto\"\xc4\x0c\n\x0c\x41\x64minMessage\x12\x1a\n\tset_owner\x18\x02 \x01(\x0b\x32\x05.UserH\x00\x12\x1f\n\x0bset_channel\x18\x03 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1d\n\x13get_channel_request\x18\x06 \x01(\rH\x00\x12(\n\x14get_channel_response\x18\x07 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_owner_request\x18\x08 \x01(\x08H\x00\x12#\n\x12get_owner_response\x18\t \x01(\x0b\x32\x05.UserH\x00\x12\x36\n\x12get_config_request\x18\n \x01(\x0e\x32\x18.AdminMessage.ConfigTypeH\x00\x12&\n\x13get_config_response\x18\x0b \x01(\x0b\x32\x07.ConfigH\x00\x12\x1d\n\nset_config\x18\x0c \x01(\x0b\x32\x07.ConfigH\x00\x12\x1c\n\x12\x63onfirm_set_config\x18\r \x01(\x08H\x00\x12\x43\n\x19get_module_config_request\x18\x0e \x01(\x0e\x32\x1e.AdminMessage.ModuleConfigTypeH\x00\x12\x33\n\x1aget_module_config_response\x18\x0f \x01(\x0b\x32\r.ModuleConfigH\x00\x12*\n\x11set_module_config\x18\x10 \x01(\x0b\x32\r.ModuleConfigH\x00\x12#\n\x19\x63onfirm_set_module_config\x18\x11 \x01(\x08H\x00\x12\x1d\n\x13\x63onfirm_set_channel\x18  \x01(\x08H\x00\x12\x1b\n\x11\x63onfirm_set_radio\x18! \x01(\x08H\x00\x12\x18\n\x0e\x65xit_simulator\x18\" \x01(\x08H\x00\x12\x18\n\x0ereboot_seconds\x18# \x01(\x05H\x00\x12\x31\n\'get_canned_message_module_part1_request\x18$ \x01(\x08H\x00\x12\x32\n(get_canned_message_module_part1_response\x18% \x01(\tH\x00\x12\x31\n\'get_canned_message_module_part2_request\x18& \x01(\x08H\x00\x12\x32\n(get_canned_message_module_part2_response\x18\' \x01(\tH\x00\x12\x31\n\'get_canned_message_module_part3_request\x18( \x01(\x08H\x00\x12\x32\n(get_canned_message_module_part3_response\x18) \x01(\tH\x00\x12\x31\n\'get_canned_message_module_part4_request\x18* \x01(\x08H\x00\x12\x32\n(get_canned_message_module_part4_response\x18+ \x01(\tH\x00\x12)\n\x1fset_canned_message_module_part1\x18, \x01(\tH\x00\x12)\n\x1fset_canned_message_module_part2\x18- \x01(\tH\x00\x12)\n\x1fset_canned_message_module_part3\x18. \x01(\tH\x00\x12)\n\x1fset_canned_message_module_part4\x18/ \x01(\tH\x00\x12\x1a\n\x10shutdown_seconds\x18\x33 \x01(\x05H\x00\"|\n\nConfigType\x12\x11\n\rDEVICE_CONFIG\x10\x00\x12\x13\n\x0fPOSITION_CONFIG\x10\x01\x12\x10\n\x0cPOWER_CONFIG\x10\x02\x12\x0f\n\x0bWIFI_CONFIG\x10\x03\x12\x12\n\x0e\x44ISPLAY_CONFIG\x10\x04\x12\x0f\n\x0bLORA_CONFIG\x10\x05\"\xa6\x01\n\x10ModuleConfigType\x12\x0f\n\x0bMQTT_CONFIG\x10\x00\x12\x11\n\rSERIAL_CONFIG\x10\x01\x12\x13\n\x0f\x45XTNOTIF_CONFIG\x10\x02\x12\x17\n\x13STOREFORWARD_CONFIG\x10\x03\x12\x14\n\x10RANGETEST_CONFIG\x10\x04\x12\x14\n\x10TELEMETRY_CONFIG\x10\x05\x12\x14\n\x10\x43\x41NNEDMSG_CONFIG\x10\x06\x42\t\n\x07variantBG\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0b\x61\x64min.proto\x1a\rchannel.proto\x1a\x0c\x63onfig.proto\x1a\x15\x64\x65vice_metadata.proto\x1a\nmesh.proto\x1a\x13module_config.proto\"\xc7\r\n\x0c\x41\x64minMessage\x12\x1a\n\tset_owner\x18\x02 \x01(\x0b\x32\x05.UserH\x00\x12\x1f\n\x0bset_channel\x18\x03 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1d\n\x13get_channel_request\x18\x06 \x01(\rH\x00\x12(\n\x14get_channel_response\x18\x07 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_owner_request\x18\x08 \x01(\x08H\x00\x12#\n\x12get_owner_response\x18\t \x01(\x0b\x32\x05.UserH\x00\x12\x36\n\x12get_config_request\x18\n \x01(\x0e\x32\x18.AdminMessage.ConfigTypeH\x00\x12&\n\x13get_config_response\x18\x0b \x01(\x0b\x32\x07.ConfigH\x00\x12\x1d\n\nset_config\x18\x0c \x01(\x0b\x32\x07.ConfigH\x00\x12\x1c\n\x12\x63onfirm_set_config\x18\r \x01(\x08H\x00\x12\x43\n\x19get_module_config_request\x18\x0e \x01(\x0e\x32\x1e.AdminMessage.ModuleConfigTypeH\x00\x12\x33\n\x1aget_module_config_response\x18\x0f \x01(\x0b\x32\r.ModuleConfigH\x00\x12*\n\x11set_module_config\x18\x10 \x01(\x0b\x32\r.ModuleConfigH\x00\x12#\n\x19\x63onfirm_set_module_config\x18\x11 \x01(\x08H\x00\x12!\n\x17get_all_channel_request\x18\x12 \x01(\x08H\x00\x12\x1d\n\x13\x63onfirm_set_channel\x18  \x01(\x08H\x00\x12\x1b\n\x11\x63onfirm_set_radio\x18! \x01(\x08H\x00\x12\x18\n\x0e\x65xit_simulator\x18\" \x01(\x08H\x00\x12\x18\n\x0ereboot_seconds\x18# \x01(\x05H\x00\x12\x31\n\'get_canned_message_module_part1_request\x18$ \x01(\x08H\x00\x12\x32\n(get_canned_message_module_part1_response\x18% \x01(\tH\x00\x12\x31\n\'get_canned_message_module_part2_request\x18& \x01(\x08H\x00\x12\x32\n(get_canned_message_module_part2_response\x18\' \x01(\tH\x00\x12\x31\n\'get_canned_message_module_part3_request\x18( \x01(\x08H\x00\x12\x32\n(get_canned_message_module_part3_response\x18) \x01(\tH\x00\x12\x31\n\'get_canned_message_module_part4_request\x18* \x01(\x08H\x00\x12\x32\n(get_canned_message_module_part4_response\x18+ \x01(\tH\x00\x12)\n\x1fset_canned_message_module_part1\x18, \x01(\tH\x00\x12)\n\x1fset_canned_message_module_part2\x18- \x01(\tH\x00\x12)\n\x1fset_canned_message_module_part3\x18. \x01(\tH\x00\x12)\n\x1fset_canned_message_module_part4\x18/ \x01(\tH\x00\x12\x1a\n\x10shutdown_seconds\x18\x33 \x01(\x05H\x00\x12%\n\x1bget_device_metadata_request\x18\x34 \x01(\rH\x00\x12\x37\n\x1cget_device_metadata_response\x18\x35 \x01(\x0b\x32\x0f.DeviceMetadataH\x00\"|\n\nConfigType\x12\x11\n\rDEVICE_CONFIG\x10\x00\x12\x13\n\x0fPOSITION_CONFIG\x10\x01\x12\x10\n\x0cPOWER_CONFIG\x10\x02\x12\x0f\n\x0bWIFI_CONFIG\x10\x03\x12\x12\n\x0e\x44ISPLAY_CONFIG\x10\x04\x12\x0f\n\x0bLORA_CONFIG\x10\x05\"\xa6\x01\n\x10ModuleConfigType\x12\x0f\n\x0bMQTT_CONFIG\x10\x00\x12\x11\n\rSERIAL_CONFIG\x10\x01\x12\x13\n\x0f\x45XTNOTIF_CONFIG\x10\x02\x12\x17\n\x13STOREFORWARD_CONFIG\x10\x03\x12\x14\n\x10RANGETEST_CONFIG\x10\x04\x12\x14\n\x10TELEMETRY_CONFIG\x10\x05\x12\x14\n\x10\x43\x41NNEDMSG_CONFIG\x10\x06\x42\t\n\x07variantBG\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
 
 
 
@@ -36,10 +37,10 @@ if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\013AdminProtosH\003Z!github.com/meshtastic/gomeshproto'
-  _ADMINMESSAGE._serialized_start=78
-  _ADMINMESSAGE._serialized_end=1682
-  _ADMINMESSAGE_CONFIGTYPE._serialized_start=1378
-  _ADMINMESSAGE_CONFIGTYPE._serialized_end=1502
-  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_start=1505
-  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_end=1671
+  _ADMINMESSAGE._serialized_start=101
+  _ADMINMESSAGE._serialized_end=1836
+  _ADMINMESSAGE_CONFIGTYPE._serialized_start=1532
+  _ADMINMESSAGE_CONFIGTYPE._serialized_end=1656
+  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_start=1659
+  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_end=1825
 # @@protoc_insertion_point(module_scope)

meshtastic/config_pb2.py

@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x63onfig.proto\"\xf1\x11\n\x06\x43onfig\x12&\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x14.Config.DeviceConfigH\x00\x12*\n\x08position\x18\x02 \x01(\x0b\x32\x16.Config.PositionConfigH\x00\x12$\n\x05power\x18\x03 \x01(\x0b\x32\x13.Config.PowerConfigH\x00\x12\"\n\x04wifi\x18\x04 \x01(\x0b\x32\x12.Config.WiFiConfigH\x00\x12(\n\x07\x64isplay\x18\x05 \x01(\x0b\x32\x15.Config.DisplayConfigH\x00\x12\"\n\x04lora\x18\x06 \x01(\x0b\x32\x12.Config.LoRaConfigH\x00\x1a\xd8\x01\n\x0c\x44\x65viceConfig\x12\'\n\x04role\x18\x01 \x01(\x0e\x32\x19.Config.DeviceConfig.Role\x12\x17\n\x0fserial_disabled\x18\x02 \x01(\x08\x12\x15\n\rfactory_reset\x18\x03 \x01(\x08\x12\x19\n\x11\x64\x65\x62ug_log_enabled\x18\x04 \x01(\x08\x12\x12\n\nntp_server\x18\x05 \x01(\t\"@\n\x04Role\x12\n\n\x06\x43lient\x10\x00\x12\x0e\n\nClientMute\x10\x01\x12\n\n\x06Router\x10\x02\x12\x10\n\x0cRouterClient\x10\x03\x1a\x86\x03\n\x0ePositionConfig\x12\x1f\n\x17position_broadcast_secs\x18\x01 \x01(\r\x12)\n!position_broadcast_smart_disabled\x18\x02 \x01(\x08\x12\x16\n\x0e\x66ixed_position\x18\x03 \x01(\x08\x12\x14\n\x0cgps_disabled\x18\x05 \x01(\x08\x12\x1b\n\x13gps_update_interval\x18\x06 \x01(\r\x12\x18\n\x10gps_attempt_time\x18\x07 \x01(\r\x12\x16\n\x0eposition_flags\x18\n \x01(\r\"\xaa\x01\n\rPositionFlags\x12\x11\n\rPOS_UNDEFINED\x10\x00\x12\x10\n\x0cPOS_ALTITUDE\x10\x01\x12\x0f\n\x0bPOS_ALT_MSL\x10\x02\x12\x0f\n\x0bPOS_GEO_SEP\x10\x04\x12\x0b\n\x07POS_DOP\x10\x08\x12\r\n\tPOS_HVDOP\x10\x10\x12\x11\n\rPOS_SATINVIEW\x10 \x12\x0f\n\x0bPOS_SEQ_NOS\x10@\x12\x12\n\rPOS_TIMESTAMP\x10\x80\x01\x1a\x8f\x04\n\x0bPowerConfig\x12\x39\n\x0e\x63harge_current\x18\x01 \x01(\x0e\x32!.Config.PowerConfig.ChargeCurrent\x12\x17\n\x0fis_power_saving\x18\x02 \x01(\x08\x12\x19\n\x11is_always_powered\x18\x03 \x01(\x08\x12&\n\x1eon_battery_shutdown_after_secs\x18\x04 \x01(\r\x12\x1f\n\x17\x61\x64\x63_multiplier_override\x18\x06 \x01(\x02\x12\x1b\n\x13wait_bluetooth_secs\x18\x07 \x01(\r\x12\x1d\n\x15mesh_sds_timeout_secs\x18\t \x01(\r\x12\x10\n\x08sds_secs\x18\n \x01(\r\x12\x0f\n\x07ls_secs\x18\x0b \x01(\r\x12\x15\n\rmin_wake_secs\x18\x0c \x01(\r\"\xd1\x01\n\rChargeCurrent\x12\x0b\n\x07MAUnset\x10\x00\x12\t\n\x05MA100\x10\x01\x12\t\n\x05MA190\x10\x02\x12\t\n\x05MA280\x10\x03\x12\t\n\x05MA360\x10\x04\x12\t\n\x05MA450\x10\x05\x12\t\n\x05MA550\x10\x06\x12\t\n\x05MA630\x10\x07\x12\t\n\x05MA700\x10\x08\x12\t\n\x05MA780\x10\t\x12\t\n\x05MA880\x10\n\x12\t\n\x05MA960\x10\x0b\x12\n\n\x06MA1000\x10\x0c\x12\n\n\x06MA1080\x10\r\x12\n\n\x06MA1160\x10\x0e\x12\n\n\x06MA1240\x10\x0f\x12\n\n\x06MA1320\x10\x10\x1aK\n\nWiFiConfig\x12\x0c\n\x04ssid\x18\x01 \x01(\t\x12\x0b\n\x03psk\x18\x02 \x01(\t\x12\x0f\n\x07\x61p_mode\x18\x03 \x01(\x08\x12\x11\n\tap_hidden\x18\x04 \x01(\x08\x1a\x8f\x02\n\rDisplayConfig\x12\x16\n\x0escreen_on_secs\x18\x01 \x01(\r\x12=\n\ngps_format\x18\x02 \x01(\x0e\x32).Config.DisplayConfig.GpsCoordinateFormat\x12!\n\x19\x61uto_screen_carousel_secs\x18\x03 \x01(\r\"\x83\x01\n\x13GpsCoordinateFormat\x12\x10\n\x0cGpsFormatDec\x10\x00\x12\x10\n\x0cGpsFormatDMS\x10\x01\x12\x10\n\x0cGpsFormatUTM\x10\x02\x12\x11\n\rGpsFormatMGRS\x10\x03\x12\x10\n\x0cGpsFormatOLC\x10\x04\x12\x11\n\rGpsFormatOSGR\x10\x05\x1a\x93\x04\n\nLoRaConfig\x12\x10\n\x08tx_power\x18\x01 \x01(\x05\x12\x34\n\x0cmodem_preset\x18\x02 \x01(\x0e\x32\x1e.Config.LoRaConfig.ModemPreset\x12\x11\n\tbandwidth\x18\x03 \x01(\r\x12\x15\n\rspread_factor\x18\x04 \x01(\r\x12\x13\n\x0b\x63oding_rate\x18\x05 \x01(\r\x12\x18\n\x10\x66requency_offset\x18\x06 \x01(\x02\x12-\n\x06region\x18\x07 \x01(\x0e\x32\x1d.Config.LoRaConfig.RegionCode\x12\x11\n\thop_limit\x18\x08 \x01(\r\x12\x13\n\x0btx_disabled\x18\t \x01(\x08\x12\x17\n\x0fignore_incoming\x18g \x03(\r\"\x81\x01\n\nRegionCode\x12\t\n\x05Unset\x10\x00\x12\x06\n\x02US\x10\x01\x12\t\n\x05\x45U433\x10\x02\x12\t\n\x05\x45U868\x10\x03\x12\x06\n\x02\x43N\x10\x04\x12\x06\n\x02JP\x10\x05\x12\x07\n\x03\x41NZ\x10\x06\x12\x06\n\x02KR\x10\x07\x12\x06\n\x02TW\x10\x08\x12\x06\n\x02RU\x10\t\x12\x06\n\x02IN\x10\n\x12\t\n\x05NZ865\x10\x0b\x12\x06\n\x02TH\x10\x0c\"p\n\x0bModemPreset\x12\x0c\n\x08LongFast\x10\x00\x12\x0c\n\x08LongSlow\x10\x01\x12\r\n\tVLongSlow\x10\x02\x12\x0b\n\x07MidSlow\x10\x03\x12\x0b\n\x07MidFast\x10\x04\x12\r\n\tShortSlow\x10\x05\x12\r\n\tShortFast\x10\x06\x42\x10\n\x0epayloadVariantBH\n\x13\x63om.geeksville.meshB\x0c\x43onfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x63onfig.proto\"\xec\x12\n\x06\x43onfig\x12&\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x14.Config.DeviceConfigH\x00\x12*\n\x08position\x18\x02 \x01(\x0b\x32\x16.Config.PositionConfigH\x00\x12$\n\x05power\x18\x03 \x01(\x0b\x32\x13.Config.PowerConfigH\x00\x12\"\n\x04wifi\x18\x04 \x01(\x0b\x32\x12.Config.WiFiConfigH\x00\x12(\n\x07\x64isplay\x18\x05 \x01(\x0b\x32\x15.Config.DisplayConfigH\x00\x12\"\n\x04lora\x18\x06 \x01(\x0b\x32\x12.Config.LoRaConfigH\x00\x1a\xd8\x01\n\x0c\x44\x65viceConfig\x12\'\n\x04role\x18\x01 \x01(\x0e\x32\x19.Config.DeviceConfig.Role\x12\x17\n\x0fserial_disabled\x18\x02 \x01(\x08\x12\x15\n\rfactory_reset\x18\x03 \x01(\x08\x12\x19\n\x11\x64\x65\x62ug_log_enabled\x18\x04 \x01(\x08\x12\x12\n\nntp_server\x18\x05 \x01(\t\"@\n\x04Role\x12\n\n\x06\x43lient\x10\x00\x12\x0e\n\nClientMute\x10\x01\x12\n\n\x06Router\x10\x02\x12\x10\n\x0cRouterClient\x10\x03\x1a\xa8\x03\n\x0ePositionConfig\x12\x1f\n\x17position_broadcast_secs\x18\x01 \x01(\r\x12)\n!position_broadcast_smart_disabled\x18\x02 \x01(\x08\x12\x16\n\x0e\x66ixed_position\x18\x03 \x01(\x08\x12\x14\n\x0cgps_disabled\x18\x05 \x01(\x08\x12\x1b\n\x13gps_update_interval\x18\x06 \x01(\r\x12\x18\n\x10gps_attempt_time\x18\x07 \x01(\r\x12\x16\n\x0eposition_flags\x18\n \x01(\r\"\xcc\x01\n\rPositionFlags\x12\x11\n\rPOS_UNDEFINED\x10\x00\x12\x10\n\x0cPOS_ALTITUDE\x10\x01\x12\x0f\n\x0bPOS_ALT_MSL\x10\x02\x12\x0f\n\x0bPOS_GEO_SEP\x10\x04\x12\x0b\n\x07POS_DOP\x10\x08\x12\r\n\tPOS_HVDOP\x10\x10\x12\x11\n\rPOS_SATINVIEW\x10 \x12\x0f\n\x0bPOS_SEQ_NOS\x10@\x12\x12\n\rPOS_TIMESTAMP\x10\x80\x01\x12\x10\n\x0bPOS_HEADING\x10\x80\x02\x12\x0e\n\tPOS_SPEED\x10\x80\x04\x1a\xf4\x03\n\x0bPowerConfig\x12\x39\n\x0e\x63harge_current\x18\x01 \x01(\x0e\x32!.Config.PowerConfig.ChargeCurrent\x12\x17\n\x0fis_power_saving\x18\x02 \x01(\x08\x12&\n\x1eon_battery_shutdown_after_secs\x18\x04 \x01(\r\x12\x1f\n\x17\x61\x64\x63_multiplier_override\x18\x06 \x01(\x02\x12\x1b\n\x13wait_bluetooth_secs\x18\x07 \x01(\r\x12\x1d\n\x15mesh_sds_timeout_secs\x18\t \x01(\r\x12\x10\n\x08sds_secs\x18\n \x01(\r\x12\x0f\n\x07ls_secs\x18\x0b \x01(\r\x12\x15\n\rmin_wake_secs\x18\x0c \x01(\r\"\xd1\x01\n\rChargeCurrent\x12\x0b\n\x07MAUnset\x10\x00\x12\t\n\x05MA100\x10\x01\x12\t\n\x05MA190\x10\x02\x12\t\n\x05MA280\x10\x03\x12\t\n\x05MA360\x10\x04\x12\t\n\x05MA450\x10\x05\x12\t\n\x05MA550\x10\x06\x12\t\n\x05MA630\x10\x07\x12\t\n\x05MA700\x10\x08\x12\t\n\x05MA780\x10\t\x12\t\n\x05MA880\x10\n\x12\t\n\x05MA960\x10\x0b\x12\n\n\x06MA1000\x10\x0c\x12\n\n\x06MA1080\x10\r\x12\n\n\x06MA1160\x10\x0e\x12\n\n\x06MA1240\x10\x0f\x12\n\n\x06MA1320\x10\x10\x1a\xa3\x01\n\nWiFiConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12)\n\x04mode\x18\x02 \x01(\x0e\x32\x1b.Config.WiFiConfig.WiFiMode\x12\x0c\n\x04ssid\x18\x03 \x01(\t\x12\x0b\n\x03psk\x18\x04 \x01(\t\">\n\x08WiFiMode\x12\n\n\x06\x43lient\x10\x00\x12\x0f\n\x0b\x41\x63\x63\x65ssPoint\x10\x01\x12\x15\n\x11\x41\x63\x63\x65ssPointHidden\x10\x02\x1a\xaa\x02\n\rDisplayConfig\x12\x16\n\x0escreen_on_secs\x18\x01 \x01(\r\x12=\n\ngps_format\x18\x02 \x01(\x0e\x32).Config.DisplayConfig.GpsCoordinateFormat\x12!\n\x19\x61uto_screen_carousel_secs\x18\x03 \x01(\r\x12\x19\n\x11\x63ompass_north_top\x18\x04 \x01(\x08\"\x83\x01\n\x13GpsCoordinateFormat\x12\x10\n\x0cGpsFormatDec\x10\x00\x12\x10\n\x0cGpsFormatDMS\x10\x01\x12\x10\n\x0cGpsFormatUTM\x10\x02\x12\x11\n\rGpsFormatMGRS\x10\x03\x12\x10\n\x0cGpsFormatOLC\x10\x04\x12\x11\n\rGpsFormatOSGR\x10\x05\x1a\x93\x04\n\nLoRaConfig\x12\x10\n\x08tx_power\x18\x01 \x01(\x05\x12\x34\n\x0cmodem_preset\x18\x02 \x01(\x0e\x32\x1e.Config.LoRaConfig.ModemPreset\x12\x11\n\tbandwidth\x18\x03 \x01(\r\x12\x15\n\rspread_factor\x18\x04 \x01(\r\x12\x13\n\x0b\x63oding_rate\x18\x05 \x01(\r\x12\x18\n\x10\x66requency_offset\x18\x06 \x01(\x02\x12-\n\x06region\x18\x07 \x01(\x0e\x32\x1d.Config.LoRaConfig.RegionCode\x12\x11\n\thop_limit\x18\x08 \x01(\r\x12\x13\n\x0btx_disabled\x18\t \x01(\x08\x12\x17\n\x0fignore_incoming\x18g \x03(\r\"\x81\x01\n\nRegionCode\x12\t\n\x05Unset\x10\x00\x12\x06\n\x02US\x10\x01\x12\t\n\x05\x45U433\x10\x02\x12\t\n\x05\x45U868\x10\x03\x12\x06\n\x02\x43N\x10\x04\x12\x06\n\x02JP\x10\x05\x12\x07\n\x03\x41NZ\x10\x06\x12\x06\n\x02KR\x10\x07\x12\x06\n\x02TW\x10\x08\x12\x06\n\x02RU\x10\t\x12\x06\n\x02IN\x10\n\x12\t\n\x05NZ865\x10\x0b\x12\x06\n\x02TH\x10\x0c\"p\n\x0bModemPreset\x12\x0c\n\x08LongFast\x10\x00\x12\x0c\n\x08LongSlow\x10\x01\x12\r\n\tVLongSlow\x10\x02\x12\x0b\n\x07MedSlow\x10\x03\x12\x0b\n\x07MedFast\x10\x04\x12\r\n\tShortSlow\x10\x05\x12\r\n\tShortFast\x10\x06\x42\x10\n\x0epayloadVariantBH\n\x13\x63om.geeksville.meshB\x0c\x43onfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
 
 
 
@@ -28,6 +28,7 @@ _CONFIG_LORACONFIG = _CONFIG.nested_types_by_name['LoRaConfig']
 _CONFIG_DEVICECONFIG_ROLE = _CONFIG_DEVICECONFIG.enum_types_by_name['Role']
 _CONFIG_POSITIONCONFIG_POSITIONFLAGS = _CONFIG_POSITIONCONFIG.enum_types_by_name['PositionFlags']
 _CONFIG_POWERCONFIG_CHARGECURRENT = _CONFIG_POWERCONFIG.enum_types_by_name['ChargeCurrent']
+_CONFIG_WIFICONFIG_WIFIMODE = _CONFIG_WIFICONFIG.enum_types_by_name['WiFiMode']
 _CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT = _CONFIG_DISPLAYCONFIG.enum_types_by_name['GpsCoordinateFormat']
 _CONFIG_LORACONFIG_REGIONCODE = _CONFIG_LORACONFIG.enum_types_by_name['RegionCode']
 _CONFIG_LORACONFIG_MODEMPRESET = _CONFIG_LORACONFIG.enum_types_by_name['ModemPreset']
@@ -91,29 +92,31 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\014ConfigProtosH\003Z!github.com/meshtastic/gomeshproto'
   _CONFIG._serialized_start=17
-  _CONFIG._serialized_end=2306
+  _CONFIG._serialized_end=2429
   _CONFIG_DEVICECONFIG._serialized_start=264
   _CONFIG_DEVICECONFIG._serialized_end=480
   _CONFIG_DEVICECONFIG_ROLE._serialized_start=416
   _CONFIG_DEVICECONFIG_ROLE._serialized_end=480
   _CONFIG_POSITIONCONFIG._serialized_start=483
-  _CONFIG_POSITIONCONFIG._serialized_end=873
+  _CONFIG_POSITIONCONFIG._serialized_end=907
   _CONFIG_POSITIONCONFIG_POSITIONFLAGS._serialized_start=703
-  _CONFIG_POSITIONCONFIG_POSITIONFLAGS._serialized_end=873
-  _CONFIG_POWERCONFIG._serialized_start=876
-  _CONFIG_POWERCONFIG._serialized_end=1403
-  _CONFIG_POWERCONFIG_CHARGECURRENT._serialized_start=1194
-  _CONFIG_POWERCONFIG_CHARGECURRENT._serialized_end=1403
-  _CONFIG_WIFICONFIG._serialized_start=1405
-  _CONFIG_WIFICONFIG._serialized_end=1480
-  _CONFIG_DISPLAYCONFIG._serialized_start=1483
-  _CONFIG_DISPLAYCONFIG._serialized_end=1754
-  _CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT._serialized_start=1623
-  _CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT._serialized_end=1754
-  _CONFIG_LORACONFIG._serialized_start=1757
-  _CONFIG_LORACONFIG._serialized_end=2288
-  _CONFIG_LORACONFIG_REGIONCODE._serialized_start=2045
-  _CONFIG_LORACONFIG_REGIONCODE._serialized_end=2174
-  _CONFIG_LORACONFIG_MODEMPRESET._serialized_start=2176
-  _CONFIG_LORACONFIG_MODEMPRESET._serialized_end=2288
+  _CONFIG_POSITIONCONFIG_POSITIONFLAGS._serialized_end=907
+  _CONFIG_POWERCONFIG._serialized_start=910
+  _CONFIG_POWERCONFIG._serialized_end=1410
+  _CONFIG_POWERCONFIG_CHARGECURRENT._serialized_start=1201
+  _CONFIG_POWERCONFIG_CHARGECURRENT._serialized_end=1410
+  _CONFIG_WIFICONFIG._serialized_start=1413
+  _CONFIG_WIFICONFIG._serialized_end=1576
+  _CONFIG_WIFICONFIG_WIFIMODE._serialized_start=1514
+  _CONFIG_WIFICONFIG_WIFIMODE._serialized_end=1576
+  _CONFIG_DISPLAYCONFIG._serialized_start=1579
+  _CONFIG_DISPLAYCONFIG._serialized_end=1877
+  _CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT._serialized_start=1746
+  _CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT._serialized_end=1877
+  _CONFIG_LORACONFIG._serialized_start=1880
+  _CONFIG_LORACONFIG._serialized_end=2411
+  _CONFIG_LORACONFIG_REGIONCODE._serialized_start=2168
+  _CONFIG_LORACONFIG_REGIONCODE._serialized_end=2297
+  _CONFIG_LORACONFIG_MODEMPRESET._serialized_start=2299
+  _CONFIG_LORACONFIG_MODEMPRESET._serialized_end=2411
 # @@protoc_insertion_point(module_scope)

meshtastic/device_metadata_pb2.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: device_metadata.proto
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x64\x65vice_metadata.proto\"H\n\x0e\x44\x65viceMetadata\x12\x18\n\x10\x66irmware_version\x18\x01 \x01(\t\x12\x1c\n\x14\x64\x65vice_state_version\x18\x02 \x01(\rBP\n\x13\x63om.geeksville.meshB\x14\x44\x65viceMetadataProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
+
+
+
+_DEVICEMETADATA = DESCRIPTOR.message_types_by_name['DeviceMetadata']
+DeviceMetadata = _reflection.GeneratedProtocolMessageType('DeviceMetadata', (_message.Message,), {
+  'DESCRIPTOR' : _DEVICEMETADATA,
+  '__module__' : 'device_metadata_pb2'
+  # @@protoc_insertion_point(class_scope:DeviceMetadata)
+  })
+_sym_db.RegisterMessage(DeviceMetadata)
+
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\024DeviceMetadataProtosH\003Z!github.com/meshtastic/gomeshproto'
+  _DEVICEMETADATA._serialized_start=25
+  _DEVICEMETADATA._serialized_end=97
+# @@protoc_insertion_point(module_scope)

meshtastic/mesh_interface.py

@@ -362,11 +362,9 @@ class MeshInterface:
 
     def waitForConfig(self):
         """Block until radio config is received. Returns True if config has been received."""
-        # TODO
-        return True
-        #success = self._timeout.waitForSet(self, attrs=('myInfo', 'nodes')) and self.localNode.waitForConfig()
-        #if not success:
-            #raise Exception("Timed out waiting for interface config")
+        success = self._timeout.waitForSet(self, attrs=('myInfo', 'nodes')) and self.localNode.waitForConfig()
+        if not success:
+            raise Exception("Timed out waiting for interface config")
 
     def getMyNodeInfo(self):
         """Get info about my node."""
@@ -424,10 +422,8 @@ class MeshInterface:
         """We need to send a heartbeat message to the device every X seconds"""
         def callback():
             self.heartbeatTimer = None
-            # TODO
-            # prefs = self.localNode.radioConfig.preferences
-            #i = prefs.phone_timeout_secs / 2
-            i = 0
+            prefs = self.localNode.localConfig
+            i = prefs.power.ls_secs / 2
             logging.debug(f"Sending heartbeat, interval {i}")
             if i != 0:
                 self.heartbeatTimer = threading.Timer(i, callback)
@@ -536,29 +532,44 @@ class MeshInterface:
             # stream API fromRadio.config_complete_id
             logging.debug(f"Config complete ID {self.configId}")
             self._handleConfigComplete()
+
         elif fromRadio.HasField("packet"):
             self._handlePacketFromRadio(fromRadio.packet)
+
         elif fromRadio.rebooted:
             # Tell clients the device went away.  Careful not to call the overridden
             # subclass version that closes the serial port
             MeshInterface._disconnected(self)
 
             self._startConfig()  # redownload the node db etc...
-        elif fromRadio.config:
-            logging.debug("Hey! We got some configs")
+
+        elif fromRadio.config or fromRadio.moduleConfig:
             if fromRadio.config.HasField("device"):
-                logging.debug("device!")
-                # TODO: do something with this config
+                self.localNode.localConfig.device.CopyFrom(fromRadio.config.device)
             elif fromRadio.config.HasField("position"):
-                logging.debug("position!")
+                self.localNode.localConfig.position.CopyFrom(fromRadio.config.position)
             elif fromRadio.config.HasField("power"):
-                logging.debug("power!")
+                self.localNode.localConfig.power.CopyFrom(fromRadio.config.power)
             elif fromRadio.config.HasField("wifi"):
-                logging.debug("wifi!")
+                self.localNode.localConfig.wifi.CopyFrom(fromRadio.config.wifi)
             elif fromRadio.config.HasField("display"):
-                logging.debug("display!")
+                self.localNode.localConfig.display.CopyFrom(fromRadio.config.display)
             elif fromRadio.config.HasField("lora"):
-                logging.debug("lora!")
+                self.localNode.localConfig.lora.CopyFrom(fromRadio.config.lora)
+
+            elif fromRadio.moduleConfig.HasField("mqtt"):
+                self.localNode.moduleConfig.mqtt.CopyFrom(fromRadio.moduleConfig.mqtt)
+            elif fromRadio.moduleConfig.HasField("serial"):
+                self.localNode.moduleConfig.serial.CopyFrom(fromRadio.moduleConfig.serial)
+            elif fromRadio.moduleConfig.HasField("external_notification"):
+                self.localNode.moduleConfig.external_notification.CopyFrom(fromRadio.moduleConfig.external_notification)
+            elif fromRadio.moduleConfig.HasField("range_test"):
+                self.localNode.moduleConfig.range_test.CopyFrom(fromRadio.moduleConfig.range_test)
+            elif fromRadio.moduleConfig.HasField("telemetry"):
+                self.localNode.moduleConfig.telemetry.CopyFrom(fromRadio.moduleConfig.telemetry)
+            elif fromRadio.moduleConfig.HasField("canned_message"):
+                self.localNode.moduleConfig.canned_message.CopyFrom(fromRadio.moduleConfig.canned_message)
+
         else:
             logging.debug("Unexpected FromRadio payload")
 

meshtastic/module_config_pb2.py

@@ -15,7 +15,7 @@ _sym_db = _symbol_database.Default()
 from . import telemetry_pb2 as telemetry__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13module_config.proto\x1a\x0ftelemetry.proto\"\xd7\x12\n\x0cModuleConfig\x12(\n\x04mqtt\x18\x01 \x01(\x0b\x32\x18.ModuleConfig.MQTTConfigH\x00\x12,\n\x06serial\x18\x02 \x01(\x0b\x32\x1a.ModuleConfig.SerialConfigH\x00\x12I\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32(.ModuleConfig.ExternalNotificationConfigH\x00\x12\x39\n\rstore_forward\x18\x04 \x01(\x0b\x32 .ModuleConfig.StoreForwardConfigH\x00\x12\x33\n\nrange_test\x18\x05 \x01(\x0b\x32\x1d.ModuleConfig.RangeTestConfigH\x00\x12\x32\n\ttelemetry\x18\x06 \x01(\x0b\x32\x1d.ModuleConfig.TelemetryConfigH\x00\x12;\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32!.ModuleConfig.CannedMessageConfigH\x00\x1ao\n\nMQTTConfig\x12\x10\n\x08\x64isabled\x18\x01 \x01(\x08\x12\x0f\n\x07\x61\x64\x64ress\x18\x02 \x01(\t\x12\x10\n\x08username\x18\x03 \x01(\t\x12\x10\n\x08password\x18\x04 \x01(\t\x12\x1a\n\x12\x65ncryption_enabled\x18\x05 \x01(\x08\x1a\x93\x04\n\x0cSerialConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x0c\n\x04\x65\x63ho\x18\x02 \x01(\x08\x12\x0b\n\x03rxd\x18\x03 \x01(\r\x12\x0b\n\x03txd\x18\x04 \x01(\r\x12\x34\n\x04\x62\x61ud\x18\x05 \x01(\x0e\x32&.ModuleConfig.SerialConfig.Serial_Baud\x12\x0f\n\x07timeout\x18\x06 \x01(\r\x12\x34\n\x04mode\x18\x07 \x01(\x0e\x32&.ModuleConfig.SerialConfig.Serial_Mode\"\x8a\x02\n\x0bSerial_Baud\x12\x10\n\x0c\x42\x41UD_Default\x10\x00\x12\x0c\n\x08\x42\x41UD_110\x10\x01\x12\x0c\n\x08\x42\x41UD_300\x10\x02\x12\x0c\n\x08\x42\x41UD_600\x10\x03\x12\r\n\tBAUD_1200\x10\x04\x12\r\n\tBAUD_2400\x10\x05\x12\r\n\tBAUD_4800\x10\x06\x12\r\n\tBAUD_9600\x10\x07\x12\x0e\n\nBAUD_19200\x10\x08\x12\x0e\n\nBAUD_38400\x10\t\x12\x0e\n\nBAUD_57600\x10\n\x12\x0f\n\x0b\x42\x41UD_115200\x10\x0b\x12\x0f\n\x0b\x42\x41UD_230400\x10\x0c\x12\x0f\n\x0b\x42\x41UD_460800\x10\r\x12\x0f\n\x0b\x42\x41UD_576000\x10\x0e\x12\x0f\n\x0b\x42\x41UD_921600\x10\x0f\"@\n\x0bSerial_Mode\x12\x10\n\x0cMODE_Default\x10\x00\x12\x0f\n\x0bMODE_SIMPLE\x10\x01\x12\x0e\n\nMODE_PROTO\x10\x02\x1a\x8b\x01\n\x1a\x45xternalNotificationConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x11\n\toutput_ms\x18\x02 \x01(\r\x12\x0e\n\x06output\x18\x03 \x01(\r\x12\x0e\n\x06\x61\x63tive\x18\x04 \x01(\x08\x12\x15\n\ralert_message\x18\x05 \x01(\x08\x12\x12\n\nalert_bell\x18\x06 \x01(\x08\x1a\x84\x01\n\x12StoreForwardConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x11\n\theartbeat\x18\x02 \x01(\x08\x12\x0f\n\x07records\x18\x03 \x01(\r\x12\x1a\n\x12history_return_max\x18\x04 \x01(\r\x12\x1d\n\x15history_return_window\x18\x05 \x01(\r\x1a@\n\x0fRangeTestConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x0e\n\x06sender\x18\x02 \x01(\r\x12\x0c\n\x04save\x18\x03 \x01(\x08\x1a\xf9\x02\n\x0fTelemetryConfig\x12\x1e\n\x16\x64\x65vice_update_interval\x18\x01 \x01(\r\x12#\n\x1b\x65nvironment_update_interval\x18\x02 \x01(\r\x12\'\n\x1f\x65nvironment_measurement_enabled\x18\x03 \x01(\x08\x12\"\n\x1a\x65nvironment_screen_enabled\x18\x04 \x01(\x08\x12.\n&environment_read_error_count_threshold\x18\x05 \x01(\r\x12%\n\x1d\x65nvironment_recovery_interval\x18\x06 \x01(\r\x12&\n\x1e\x65nvironment_display_fahrenheit\x18\x07 \x01(\x08\x12\x35\n\x17\x65nvironment_sensor_type\x18\x08 \x01(\x0e\x32\x14.TelemetrySensorType\x12\x1e\n\x16\x65nvironment_sensor_pin\x18\t \x01(\r\x1a\xd6\x04\n\x13\x43\x61nnedMessageConfig\x12\x17\n\x0frotary1_enabled\x18\x01 \x01(\x08\x12\x19\n\x11inputbroker_pin_a\x18\x02 \x01(\r\x12\x19\n\x11inputbroker_pin_b\x18\x03 \x01(\r\x12\x1d\n\x15inputbroker_pin_press\x18\x04 \x01(\r\x12N\n\x14inputbroker_event_cw\x18\x05 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12O\n\x15inputbroker_event_ccw\x18\x06 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12Q\n\x17inputbroker_event_press\x18\x07 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12\x17\n\x0fupdown1_enabled\x18\x08 \x01(\x08\x12\x0f\n\x07\x65nabled\x18\t \x01(\x08\x12\x1a\n\x12\x61llow_input_source\x18\n \x01(\t\x12\x11\n\tsend_bell\x18\x0b \x01(\x08\"\x83\x01\n\x0eInputEventChar\x12\x0c\n\x08KEY_NONE\x10\x00\x12\n\n\x06KEY_UP\x10\x11\x12\x0c\n\x08KEY_DOWN\x10\x12\x12\x0c\n\x08KEY_LEFT\x10\x13\x12\r\n\tKEY_RIGHT\x10\x14\x12\x0e\n\nKEY_SELECT\x10\n\x12\x0c\n\x08KEY_BACK\x10\x1b\x12\x0e\n\nKEY_CANCEL\x10\x18\x42\x10\n\x0epayloadVariantBN\n\x13\x63om.geeksville.meshB\x12ModuleConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13module_config.proto\x1a\x0ftelemetry.proto\"\xa9\x11\n\x0cModuleConfig\x12(\n\x04mqtt\x18\x01 \x01(\x0b\x32\x18.ModuleConfig.MQTTConfigH\x00\x12,\n\x06serial\x18\x02 \x01(\x0b\x32\x1a.ModuleConfig.SerialConfigH\x00\x12I\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32(.ModuleConfig.ExternalNotificationConfigH\x00\x12\x39\n\rstore_forward\x18\x04 \x01(\x0b\x32 .ModuleConfig.StoreForwardConfigH\x00\x12\x33\n\nrange_test\x18\x05 \x01(\x0b\x32\x1d.ModuleConfig.RangeTestConfigH\x00\x12\x32\n\ttelemetry\x18\x06 \x01(\x0b\x32\x1d.ModuleConfig.TelemetryConfigH\x00\x12;\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32!.ModuleConfig.CannedMessageConfigH\x00\x1ao\n\nMQTTConfig\x12\x10\n\x08\x64isabled\x18\x01 \x01(\x08\x12\x0f\n\x07\x61\x64\x64ress\x18\x02 \x01(\t\x12\x10\n\x08username\x18\x03 \x01(\t\x12\x10\n\x08password\x18\x04 \x01(\t\x12\x1a\n\x12\x65ncryption_enabled\x18\x05 \x01(\x08\x1a\x93\x04\n\x0cSerialConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x0c\n\x04\x65\x63ho\x18\x02 \x01(\x08\x12\x0b\n\x03rxd\x18\x03 \x01(\r\x12\x0b\n\x03txd\x18\x04 \x01(\r\x12\x34\n\x04\x62\x61ud\x18\x05 \x01(\x0e\x32&.ModuleConfig.SerialConfig.Serial_Baud\x12\x0f\n\x07timeout\x18\x06 \x01(\r\x12\x34\n\x04mode\x18\x07 \x01(\x0e\x32&.ModuleConfig.SerialConfig.Serial_Mode\"\x8a\x02\n\x0bSerial_Baud\x12\x10\n\x0c\x42\x41UD_Default\x10\x00\x12\x0c\n\x08\x42\x41UD_110\x10\x01\x12\x0c\n\x08\x42\x41UD_300\x10\x02\x12\x0c\n\x08\x42\x41UD_600\x10\x03\x12\r\n\tBAUD_1200\x10\x04\x12\r\n\tBAUD_2400\x10\x05\x12\r\n\tBAUD_4800\x10\x06\x12\r\n\tBAUD_9600\x10\x07\x12\x0e\n\nBAUD_19200\x10\x08\x12\x0e\n\nBAUD_38400\x10\t\x12\x0e\n\nBAUD_57600\x10\n\x12\x0f\n\x0b\x42\x41UD_115200\x10\x0b\x12\x0f\n\x0b\x42\x41UD_230400\x10\x0c\x12\x0f\n\x0b\x42\x41UD_460800\x10\r\x12\x0f\n\x0b\x42\x41UD_576000\x10\x0e\x12\x0f\n\x0b\x42\x41UD_921600\x10\x0f\"@\n\x0bSerial_Mode\x12\x10\n\x0cMODE_Default\x10\x00\x12\x0f\n\x0bMODE_SIMPLE\x10\x01\x12\x0e\n\nMODE_PROTO\x10\x02\x1a\x8b\x01\n\x1a\x45xternalNotificationConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x11\n\toutput_ms\x18\x02 \x01(\r\x12\x0e\n\x06output\x18\x03 \x01(\r\x12\x0e\n\x06\x61\x63tive\x18\x04 \x01(\x08\x12\x15\n\ralert_message\x18\x05 \x01(\x08\x12\x12\n\nalert_bell\x18\x06 \x01(\x08\x1a\x84\x01\n\x12StoreForwardConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x11\n\theartbeat\x18\x02 \x01(\x08\x12\x0f\n\x07records\x18\x03 \x01(\r\x12\x1a\n\x12history_return_max\x18\x04 \x01(\r\x12\x1d\n\x15history_return_window\x18\x05 \x01(\r\x1a@\n\x0fRangeTestConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x0e\n\x06sender\x18\x02 \x01(\r\x12\x0c\n\x04save\x18\x03 \x01(\x08\x1a\xcb\x01\n\x0fTelemetryConfig\x12\x1e\n\x16\x64\x65vice_update_interval\x18\x01 \x01(\r\x12#\n\x1b\x65nvironment_update_interval\x18\x02 \x01(\r\x12\'\n\x1f\x65nvironment_measurement_enabled\x18\x03 \x01(\x08\x12\"\n\x1a\x65nvironment_screen_enabled\x18\x04 \x01(\x08\x12&\n\x1e\x65nvironment_display_fahrenheit\x18\x07 \x01(\x08\x1a\xd6\x04\n\x13\x43\x61nnedMessageConfig\x12\x17\n\x0frotary1_enabled\x18\x01 \x01(\x08\x12\x19\n\x11inputbroker_pin_a\x18\x02 \x01(\r\x12\x19\n\x11inputbroker_pin_b\x18\x03 \x01(\r\x12\x1d\n\x15inputbroker_pin_press\x18\x04 \x01(\r\x12N\n\x14inputbroker_event_cw\x18\x05 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12O\n\x15inputbroker_event_ccw\x18\x06 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12Q\n\x17inputbroker_event_press\x18\x07 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12\x17\n\x0fupdown1_enabled\x18\x08 \x01(\x08\x12\x0f\n\x07\x65nabled\x18\t \x01(\x08\x12\x1a\n\x12\x61llow_input_source\x18\n \x01(\t\x12\x11\n\tsend_bell\x18\x0b \x01(\x08\"\x83\x01\n\x0eInputEventChar\x12\x0c\n\x08KEY_NONE\x10\x00\x12\n\n\x06KEY_UP\x10\x11\x12\x0c\n\x08KEY_DOWN\x10\x12\x12\x0c\n\x08KEY_LEFT\x10\x13\x12\r\n\tKEY_RIGHT\x10\x14\x12\x0e\n\nKEY_SELECT\x10\n\x12\x0c\n\x08KEY_BACK\x10\x1b\x12\x0e\n\nKEY_CANCEL\x10\x18\x42\x10\n\x0epayloadVariantBN\n\x13\x63om.geeksville.meshB\x12ModuleConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
 
 
 
@@ -98,7 +98,7 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\022ModuleConfigProtosH\003Z!github.com/meshtastic/gomeshproto'
   _MODULECONFIG._serialized_start=41
-  _MODULECONFIG._serialized_end=2432
+  _MODULECONFIG._serialized_end=2258
   _MODULECONFIG_MQTTCONFIG._serialized_start=445
   _MODULECONFIG_MQTTCONFIG._serialized_end=556
   _MODULECONFIG_SERIALCONFIG._serialized_start=559
@@ -114,9 +114,9 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _MODULECONFIG_RANGETESTCONFIG._serialized_start=1369
   _MODULECONFIG_RANGETESTCONFIG._serialized_end=1433
   _MODULECONFIG_TELEMETRYCONFIG._serialized_start=1436
-  _MODULECONFIG_TELEMETRYCONFIG._serialized_end=1813
-  _MODULECONFIG_CANNEDMESSAGECONFIG._serialized_start=1816
-  _MODULECONFIG_CANNEDMESSAGECONFIG._serialized_end=2414
-  _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR._serialized_start=2283
-  _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR._serialized_end=2414
+  _MODULECONFIG_TELEMETRYCONFIG._serialized_end=1639
+  _MODULECONFIG_CANNEDMESSAGECONFIG._serialized_start=1642
+  _MODULECONFIG_CANNEDMESSAGECONFIG._serialized_end=2240
+  _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR._serialized_start=2109
+  _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR._serialized_end=2240
 # @@protoc_insertion_point(module_scope)

meshtastic/node.py

@@ -5,22 +5,22 @@ import logging
 import base64
 import time
 from google.protobuf.json_format import MessageToJson
-from meshtastic import portnums_pb2, apponly_pb2, admin_pb2, channel_pb2
+from meshtastic import portnums_pb2, apponly_pb2, admin_pb2, channel_pb2, localonly_pb2
 from meshtastic.util import pskToString, stripnl, Timeout, our_exit, fromPSK
 
 
 class Node:
     """A model of a (local or remote) node in the mesh
 
-    Includes methods for radioConfig and channels
+    Includes methods for localConfig, moduleConfig and channels
     """
 
     def __init__(self, iface, nodeNum, noProto=False):
         """Constructor"""
         self.iface = iface
         self.nodeNum = nodeNum
-        self.radioConfig = None
-        self.partialConfig = None
+        self.localConfig = localonly_pb2.LocalConfig()
+        self.moduleConfig = localonly_pb2.LocalModuleConfig()
         self.channels = None
         self._timeout = Timeout(maxSecs=300)
         self.partialChannels = None
@@ -55,28 +55,22 @@ class Node:
     def showInfo(self):
         """Show human readable description of our node"""
         prefs = ""
-        if self.radioConfig and self.radioConfig.preferences:
-            prefs = stripnl(MessageToJson(self.radioConfig.preferences))
+        if self.localConfig:
+            prefs = stripnl(MessageToJson(self.localConfig))
         print(f"Preferences: {prefs}\n")
+        prefs = ""
+        if self.moduleConfig:
+            prefs = stripnl(MessageToJson(self.moduleConfig))
+        print(f"Module preferences: {prefs}\n")
         self.showChannels()
 
     def requestConfig(self):
         """Send regular MeshPackets to ask for settings and channels."""
         logging.debug(f"requestConfig for nodeNum:{self.nodeNum}")
-        self.radioConfig = None
-        self.partialConfig = []
         self.channels = None
         self.partialChannels = []  # We keep our channels in a temp array until finished
 
-        # Note: We do not get the canned plugin message, unless get_canned_message() is called
-        self.cannedPluginMessage = None
-
-        self.cannedPluginMessagePart1 = None
-        self.cannedPluginMessagePart2 = None
-        self.cannedPluginMessagePart3 = None
-        self.cannedPluginMessagePart4 = None
-
-        self._requestSettings()
+        self._requestChannel(0)
 
     def turnOffEncryptionOnPrimaryChannel(self):
         """Turn off encryption on primary channel."""
@@ -86,25 +80,109 @@ class Node:
 
     def waitForConfig(self, attribute='channels'):
         """Block until radio config is received. Returns True if config has been received."""
-        return self._timeout.waitForSet(self, attrs=('config', attribute))
+        return self._timeout.waitForSet(self, attrs=('localConfig', attribute))
 
     def writeConfig(self):
-        """Write the current (edited) radioConfig to the device"""
-        if self.radioConfig is None:
-            our_exit("Error: No RadioConfig has been read")
+        """Write the current (edited) localConfig to the device"""
+        if self.localConfig is None:
+            our_exit("Error: No localConfig has been read")
 
-        p = admin_pb2.AdminMessage()
-        p.set_radio.CopyFrom(self.radioConfig)
+        if self.localConfig.device:
+            p = admin_pb2.AdminMessage()
+            p.set_config.device.CopyFrom(self.localConfig.device)
+            self._sendAdmin(p)
+            logging.debug("Wrote device")
+            time.sleep(0.1)
 
-        self._sendAdmin(p)
-        logging.debug("Wrote config")
+        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}")
 
@@ -165,7 +243,7 @@ class Node:
         else:
             return 0
 
-    def setOwner(self, long_name=None, short_name=None, is_licensed=False, team=None):
+    def setOwner(self, long_name=None, short_name=None, is_licensed=False):
         """Set device owner name"""
         logging.debug(f"in setOwner nodeNum:{self.nodeNum}")
         nChars = 3
@@ -194,14 +272,11 @@ class Node:
                 short_name = short_name[:nChars]
             p.set_owner.short_name = short_name
             p.set_owner.is_licensed = is_licensed
-        if team is not None:
-            p.set_owner.team = team
 
         # Note: These debug lines are used in unit tests
         logging.debug(f'p.set_owner.long_name:{p.set_owner.long_name}:')
         logging.debug(f'p.set_owner.short_name:{p.set_owner.short_name}:')
         logging.debug(f'p.set_owner.is_licensed:{p.set_owner.is_licensed}')
-        logging.debug(f'p.set_owner.team:{p.set_owner.team}')
         return self._sendAdmin(p)
 
     def getURL(self, includeAll: bool = True):
@@ -218,8 +293,8 @@ class Node:
 
     def setURL(self, url):
         """Set mesh network URL"""
-        if self.radioConfig is None:
-            our_exit("Warning: No RadioConfig has been read")
+        if self.localConfig is None:
+            our_exit("Warning: No Config has been read")
 
         # URLs are of the form https://www.meshtastic.org/d/#{base64_channel_set}
         # Split on '/#' to find the base64 encoded channel settings
@@ -252,66 +327,6 @@ class Node:
             self.writeChannel(ch.index)
             i = i + 1
 
-
-    def onResponseRequestSettings(self, p):
-        """Handle the response packets for requesting settings _requestSettings()"""
-        logging.debug(f'onResponseRequestSetting() p:{p}')
-        errorFound = False
-        if "routing" in p["decoded"]:
-            if p["decoded"]["routing"]["errorReason"] != "NONE":
-                errorFound = True
-                print(f'Error on response: {p["decoded"]["routing"]["errorReason"]}')
-        # TODO
-        #if errorFound is False:
-            #self.partialConfig[p["decoded"]["admin"]["payloadVariant"]] = p["decoded"]["admin"]["raw"].get_config_response
-            #logging.debug(f'self.partialConfig:{self.partialConfig}')
-            #self._timeout.reset()  # We made foreward progress
-            #self.gotResponse = True
-
-    def _requestSettings(self):
-        """Done with initial config messages, now send regular
-           MeshPackets to ask for settings."""
-
-        # TODO: should we check that localNode has an 'admin' channel?
-        # Show progress message for super slow operations
-        if self != self.iface.localNode:
-            print("Requesting preferences from remote node.")
-            print("Be sure:")
-            print(" 1. There is a SECONDARY channel named 'admin'.")
-            print(" 2. The '--seturl' was used to configure.")
-            print(" 3. All devices have the same modem config. (i.e., '--ch-longfast')")
-            print(" 4. All devices have been rebooted after all of the above. (optional, but recommended)")
-            print("Note: This could take a while (it requests remote channel configs, then writes config)")
-
-        p1 = admin_pb2.AdminMessage()
-        p1.get_config_request = admin_pb2.AdminMessage.ConfigType.DEVICE_CONFIG
-        self._sendAdmin(p1, wantResponse=True, onResponse=self.onResponseRequestSettings)
-
-        p2 = admin_pb2.AdminMessage()
-        p2.get_config_request = admin_pb2.AdminMessage.ConfigType.POSITION_CONFIG
-        self._sendAdmin(p2, wantResponse=True, onResponse=self.onResponseRequestSettings)
-
-        p3 = admin_pb2.AdminMessage()
-        p3.get_config_request = admin_pb2.AdminMessage.ConfigType.POWER_CONFIG
-        self._sendAdmin(p3, wantResponse=True, onResponse=self.onResponseRequestSettings)
-
-        p4 = admin_pb2.AdminMessage()
-        p4.get_config_request = admin_pb2.AdminMessage.ConfigType.WIFI_CONFIG
-        self._sendAdmin(p4, wantResponse=True, onResponse=self.onResponseRequestSettings)
-
-        p5 = admin_pb2.AdminMessage()
-        p5.get_config_request = admin_pb2.AdminMessage.ConfigType.DISPLAY_CONFIG
-        self._sendAdmin(p5, wantResponse=True, onResponse=self.onResponseRequestSettings)
-
-        p6 = admin_pb2.AdminMessage()
-        p6.get_config_request = admin_pb2.AdminMessage.ConfigType.LORA_CONFIG
-        self._sendAdmin(p6, wantResponse=True, onResponse=self.onResponseRequestSettings)
-
-        # TODO Assemble radioConfig
-
-        logging.debug("Received config, now fetching channels...")
-        self._requestChannel(0)  # now start fetching channels
-
     def onResponseRequestCannedMessagePluginMessagePart1(self, p):
         """Handle the response packet for requesting canned message plugin message part 1"""
         logging.debug(f'onResponseRequestCannedMessagePluginMessagePart1() p:{p}')
@@ -487,6 +502,14 @@ class Node:
 
         return self._sendAdmin(p)
 
+    def getMetadata(self, secs: int = 10):
+        """Tell the node to shutdown."""
+        p = admin_pb2.AdminMessage()
+        p.get_device_metadata_request = True
+        logging.info(f"Requesting device metadata")
+
+        return self._sendAdmin(p, wantResponse=True, onResponse=self.onRequestGetMetadata)
+
     def _fixupChannels(self):
         """Fixup indexes and add disabled channels as needed"""
 
@@ -510,6 +533,15 @@ class Node:
             index += 1
 
 
+    def onRequestGetMetadata(self, p):
+        """Handle the response packet for requesting device metadata getMetadata()"""
+        logging.debug(f'onRequestGetMetadata() p:{p}')
+        c = p["decoded"]["admin"]["raw"].get_device_metadata_response
+        self._timeout.reset()  # We made foreward progress
+        logging.debug(f"Received metadata {stripnl(c)}")
+        print(f"\nfirmware_version: {c.firmware_version}")
+        print(f"device_state_version: {c.device_state_version}")
+
     def onResponseRequestChannel(self, p):
         """Handle the response packet for requesting a channel _requestChannel()"""
         logging.debug(f'onResponseRequestChannel() p:{p}')

meshtastic/telemetry_pb2.py

@@ -15,22 +15,17 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0ftelemetry.proto\"i\n\rDeviceMetrics\x12\x15\n\rbattery_level\x18\x01 \x01(\r\x12\x0f\n\x07voltage\x18\x02 \x01(\x02\x12\x1b\n\x13\x63hannel_utilization\x18\x03 \x01(\x02\x12\x13\n\x0b\x61ir_util_tx\x18\x04 \x01(\x02\"\x9b\x01\n\x12\x45nvironmentMetrics\x12\x13\n\x0btemperature\x18\x01 \x01(\x02\x12\x19\n\x11relative_humidity\x18\x02 \x01(\x02\x12\x1b\n\x13\x62\x61rometric_pressure\x18\x03 \x01(\x02\x12\x16\n\x0egas_resistance\x18\x04 \x01(\x02\x12\x0f\n\x07voltage\x18\x05 \x01(\x02\x12\x0f\n\x07\x63urrent\x18\x06 \x01(\x02\"\x82\x01\n\tTelemetry\x12\x0c\n\x04time\x18\x01 \x01(\x07\x12(\n\x0e\x64\x65vice_metrics\x18\x02 \x01(\x0b\x32\x0e.DeviceMetricsH\x00\x12\x32\n\x13\x65nvironment_metrics\x18\x03 \x01(\x0b\x32\x13.EnvironmentMetricsH\x00\x42\t\n\x07variant*\xa2\x01\n\x13TelemetrySensorType\x12\n\n\x06NotSet\x10\x00\x12\t\n\x05\x44HT11\x10\x01\x12\x0b\n\x07\x44S18B20\x10\x02\x12\t\n\x05\x44HT12\x10\x03\x12\t\n\x05\x44HT21\x10\x04\x12\t\n\x05\x44HT22\x10\x05\x12\n\n\x06\x42ME280\x10\x06\x12\n\n\x06\x42ME680\x10\x07\x12\x0b\n\x07MCP9808\x10\x08\x12\t\n\x05SHTC3\x10\t\x12\n\n\x06INA260\x10\n\x12\n\n\x06INA219\x10\x0b\x42K\n\x13\x63om.geeksville.meshB\x0fTelemetryProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0ftelemetry.proto\"i\n\rDeviceMetrics\x12\x15\n\rbattery_level\x18\x01 \x01(\r\x12\x0f\n\x07voltage\x18\x02 \x01(\x02\x12\x1b\n\x13\x63hannel_utilization\x18\x03 \x01(\x02\x12\x13\n\x0b\x61ir_util_tx\x18\x04 \x01(\x02\"\x9b\x01\n\x12\x45nvironmentMetrics\x12\x13\n\x0btemperature\x18\x01 \x01(\x02\x12\x19\n\x11relative_humidity\x18\x02 \x01(\x02\x12\x1b\n\x13\x62\x61rometric_pressure\x18\x03 \x01(\x02\x12\x16\n\x0egas_resistance\x18\x04 \x01(\x02\x12\x0f\n\x07voltage\x18\x05 \x01(\x02\x12\x0f\n\x07\x63urrent\x18\x06 \x01(\x02\"\x82\x01\n\tTelemetry\x12\x0c\n\x04time\x18\x01 \x01(\x07\x12(\n\x0e\x64\x65vice_metrics\x18\x02 \x01(\x0b\x32\x0e.DeviceMetricsH\x00\x12\x32\n\x13\x65nvironment_metrics\x18\x03 \x01(\x0b\x32\x13.EnvironmentMetricsH\x00\x42\t\n\x07variant*j\n\x13TelemetrySensorType\x12\n\n\x06NotSet\x10\x00\x12\n\n\x06\x42ME280\x10\x01\x12\n\n\x06\x42ME680\x10\x02\x12\x0b\n\x07MCP9808\x10\x03\x12\n\n\x06INA260\x10\x04\x12\n\n\x06INA219\x10\x05\x12\n\n\x06\x42MP280\x10\x06\x42K\n\x13\x63om.geeksville.meshB\x0fTelemetryProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
 
 _TELEMETRYSENSORTYPE = DESCRIPTOR.enum_types_by_name['TelemetrySensorType']
 TelemetrySensorType = enum_type_wrapper.EnumTypeWrapper(_TELEMETRYSENSORTYPE)
 NotSet = 0
-DHT11 = 1
-DS18B20 = 2
-DHT12 = 3
-DHT21 = 4
-DHT22 = 5
-BME280 = 6
-BME680 = 7
-MCP9808 = 8
-SHTC3 = 9
-INA260 = 10
-INA219 = 11
+BME280 = 1
+BME680 = 2
+MCP9808 = 3
+INA260 = 4
+INA219 = 5
+BMP280 = 6
 
 
 _DEVICEMETRICS = DESCRIPTOR.message_types_by_name['DeviceMetrics']
@@ -61,8 +56,8 @@ if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\017TelemetryProtosH\003Z!github.com/meshtastic/gomeshproto'
-  _TELEMETRYSENSORTYPE._serialized_start=418
-  _TELEMETRYSENSORTYPE._serialized_end=580
+  _TELEMETRYSENSORTYPE._serialized_start=417
+  _TELEMETRYSENSORTYPE._serialized_end=523
   _DEVICEMETRICS._serialized_start=19
   _DEVICEMETRICS._serialized_end=124
   _ENVIRONMENTMETRICS._serialized_start=127

meshtastic/tests/test_main.py

@@ -789,63 +789,6 @@ def test_main_setalt(capsys):
         assert err == ''
         mo.assert_called()
 
-
-# TODO
-#@pytest.mark.unit
-#@pytest.mark.usefixtures("reset_globals")
-#def test_main_set_team_valid(capsys):
-#    """Test --set-team"""
-#    sys.argv = ['', '--set-team', 'CYAN']
-#    Globals.getInstance().set_args(sys.argv)
-#
-#    mocked_node = MagicMock(autospec=Node)
-#    def mock_setOwner(team):
-#        print('inside mocked setOwner')
-#        print(f'{team}')
-#    mocked_node.setOwner.side_effect = mock_setOwner
-#
-#    iface = MagicMock(autospec=SerialInterface)
-#    iface.localNode.return_value = mocked_node
-#
-#    with patch('meshtastic.serial_interface.SerialInterface', return_value=iface) as mo:
-#        with patch('meshtastic.mesh_pb2.Team') as mm:
-#            mm.Name.return_value = 'FAKENAME'
-#            mm.Value.return_value = 'FAKEVAL'
-#            main()
-#            out, err = capsys.readouterr()
-#            assert re.search(r'Connected to radio', out, re.MULTILINE)
-#            assert re.search(r'Setting team to', out, re.MULTILINE)
-#            assert err == ''
-#            mo.assert_called()
-#            mm.Name.assert_called()
-#            mm.Value.assert_called()
-#
-
-# TODO
-#@pytest.mark.unit
-#@pytest.mark.usefixtures("reset_globals")
-#def test_main_set_team_invalid(capsys):
-#    """Test --set-team using an invalid team name"""
-#    sys.argv = ['', '--set-team', 'NOTCYAN']
-#    Globals.getInstance().set_args(sys.argv)
-#
-#    iface = MagicMock(autospec=SerialInterface)
-#
-#    def throw_an_exception(exc):
-#        raise ValueError("Fake exception.")
-#
-#    with patch('meshtastic.serial_interface.SerialInterface', return_value=iface) as mo:
-#        with patch('meshtastic.mesh_pb2.Team') as mm:
-#            mm.Value.side_effect = throw_an_exception
-#            main()
-#            out, err = capsys.readouterr()
-#            assert re.search(r'Connected to radio', out, re.MULTILINE)
-#            assert re.search(r'ERROR: Team', out, re.MULTILINE)
-#            assert err == ''
-#            mo.assert_called()
-#            mm.Value.assert_called()
-
-
 @pytest.mark.unit
 @pytest.mark.usefixtures("reset_globals")
 def test_main_seturl(capsys):
@@ -1541,24 +1484,6 @@ def test_main_get_with_invalid(capsys):
         mo.assert_called()
 
 
-@pytest.mark.unit
-@pytest.mark.usefixtures("reset_globals")
-def test_main_setchan(capsys):
-    """Test --setchan (deprecated)"""
-    sys.argv = ['', '--setchan', 'a', 'b']
-    Globals.getInstance().set_args(sys.argv)
-
-    iface = MagicMock(autospec=SerialInterface)
-
-    with patch('meshtastic.serial_interface.SerialInterface', return_value=iface):
-        with pytest.raises(SystemExit) as pytest_wrapped_e:
-            main()
-        assert pytest_wrapped_e.type == SystemExit
-        assert pytest_wrapped_e.value.code == 1
-        _, err = capsys.readouterr()
-        assert re.search(r'usage:', err, re.MULTILINE)
-
-
 @pytest.mark.unit
 @pytest.mark.usefixtures("reset_globals")
 def test_main_onReceive_empty(caplog, capsys):

meshtastic/tests/test_node.py

@@ -164,19 +164,6 @@ from ..channel_pb2 import Channel
 #    assert err == ''
 
 
-# TODO
-#@pytest.mark.unit
-#def test_setOwner_and_team(caplog):
-#    """Test setOwner"""
-#    anode = Node('foo', 'bar', noProto=True)
-#    with caplog.at_level(logging.DEBUG):
-#        anode.setOwner(long_name ='Test123', short_name='123', team=1)
-#    assert re.search(r'p.set_owner.long_name:Test123:', caplog.text, re.MULTILINE)
-#    assert re.search(r'p.set_owner.short_name:123:', caplog.text, re.MULTILINE)
-#    assert re.search(r'p.set_owner.is_licensed:False', caplog.text, re.MULTILINE)
-#    assert re.search(r'p.set_owner.team:1', caplog.text, re.MULTILINE)
-
-
 # TODO
 #@pytest.mark.unit
 #def test_setOwnerShort(caplog):
@@ -197,7 +184,6 @@ from ..channel_pb2 import Channel
 #    assert re.search(r'p.set_owner.long_name:Test123:', caplog.text, re.MULTILINE)
 #    assert re.search(r'p.set_owner.short_name:Tst:', caplog.text, re.MULTILINE)
 #    assert re.search(r'p.set_owner.is_licensed:False', caplog.text, re.MULTILINE)
-#    assert re.search(r'p.set_owner.team:0', caplog.text, re.MULTILINE)
 
 
 # TODO
@@ -210,7 +196,6 @@ from ..channel_pb2 import Channel
 #    assert re.search(r'p.set_owner.long_name:Tnt:', caplog.text, re.MULTILINE)
 #    assert re.search(r'p.set_owner.short_name:Tnt:', caplog.text, re.MULTILINE)
 #    assert re.search(r'p.set_owner.is_licensed:False', caplog.text, re.MULTILINE)
-#    assert re.search(r'p.set_owner.team:0', caplog.text, re.MULTILINE)
 
 
 # TODO
@@ -223,7 +208,6 @@ from ..channel_pb2 import Channel
 #    assert re.search(r'p.set_owner.long_name:A B C:', caplog.text, re.MULTILINE)
 #    assert re.search(r'p.set_owner.short_name:ABC:', caplog.text, re.MULTILINE)
 #    assert re.search(r'p.set_owner.is_licensed:True', caplog.text, re.MULTILINE)
-#    assert re.search(r'p.set_owner.team:0', caplog.text, re.MULTILINE)
 
 
 # TODO

meshtastic/tests/test_smoke1.py

@@ -214,26 +214,6 @@ def test_smoke1_set_owner():
     assert return_value == 0
 
 
-@pytest.mark.smoke1
-def test_smoke1_set_team():
-    """Test --set-team """
-    # unset the team
-    return_value, out = subprocess.getstatusoutput('meshtastic --set-team CLEAR')
-    assert re.match(r'Connected to radio', out)
-    assert re.search(r'^Setting team to CLEAR', out, re.MULTILINE)
-    assert return_value == 0
-    # pause for the radio
-    time.sleep(PAUSE_AFTER_REBOOT)
-    return_value, out = subprocess.getstatusoutput('meshtastic --set-team CYAN')
-    assert re.search(r'Setting team to CYAN', out, re.MULTILINE)
-    assert return_value == 0
-    # pause for the radio
-    time.sleep(PAUSE_AFTER_REBOOT)
-    return_value, out = subprocess.getstatusoutput('meshtastic --info')
-    assert re.search(r'CYAN', out, re.MULTILINE)
-    assert return_value == 0
-
-
 @pytest.mark.smoke1
 def test_smoke1_ch_set_modem_config():
     """Test --ch-set modem_config"""

meshtastic/tests/test_smokevirt.py

@@ -219,26 +219,6 @@ def test_smokevirt_set_owner():
     assert return_value == 0
 
 
-@pytest.mark.smokevirt
-def test_smokevirt_set_team():
-    """Test --set-team """
-    # unset the team
-    return_value, out = subprocess.getstatusoutput('meshtastic --host localhost --set-team CLEAR')
-    assert re.match(r'Connected to radio', out)
-    assert re.search(r'^Setting team to CLEAR', out, re.MULTILINE)
-    assert return_value == 0
-    # pause for the radio
-    time.sleep(PAUSE_AFTER_REBOOT)
-    return_value, out = subprocess.getstatusoutput('meshtastic --host localhost --set-team CYAN')
-    assert re.search(r'Setting team to CYAN', out, re.MULTILINE)
-    assert return_value == 0
-    # pause for the radio
-    time.sleep(PAUSE_AFTER_REBOOT)
-    return_value, out = subprocess.getstatusoutput('meshtastic --host localhost --info')
-    assert re.search(r'CYAN', out, re.MULTILINE)
-    assert return_value == 0
-
-
 @pytest.mark.smokevirt
 def test_smokevirt_ch_values():
     """Test --ch-longslow, --ch-longfast, --ch-mediumslow, --ch-mediumsfast,

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.16",
+    version="1.3alpha.20",
     description="Python API & client shell for talking to Meshtastic devices",
     long_description=long_description,
     long_description_content_type="text/markdown",