Add alpha back for upcoming release

Refactor
Update python to use reworked protos
2025-12-26 09:27:52 -05:00 · 2022-09-09 11:05:10 -05:00 · 2022-09-09 11:02:58 -05:00 · 2022-09-09 09:49:04 -05:00 · 2022-09-08 21:43:54 +00:00 · 2022-09-08 15:55:19 -05:00
20 changed files with 441 additions and 371 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -74,7 +74,23 @@
      "request": "launch",
      "module": "meshtastic",
      "justMyCode": true,
-      "args": ["--debug", "--set", "lora.region", "1"]
+      "args": ["--debug", "--set", "lora.region", "TW"]
+    },
+    {
+      "name": "meshtastic debug set bluetooth fixed pin",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "args": ["--debug", "--set", "bluetooth.fixed_pin", "555555"]
+    },
+    {
+      "name": "meshtastic debug get bluetooth fixed pin",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "args": ["--debug", "--get", "bluetooth.fixed_pin"]
    },
    {
      "name": "meshtastic debug setPref",
@@ -116,6 +132,15 @@
      "justMyCode": true,
      "args": ["--debug", "--setchan", "psk", ""]
    },
+    {
+      "name": "meshtastic --ch-set",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "args": ["--debug", "--ch-set", "channel_num", "0", "--ch-index", "0"]
+    },
+    
    {
      "name": "meshtastic seturl",
      "type": "python",
--- a/meshtastic/main.py
+++ b/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
@@ -64,6 +65,7 @@ def getPref(config, comp_name):
    logging.debug(f'use camel:{Globals.getInstance().get_camel_case()}')

    objDesc = config.DESCRIPTOR
+    print()
    config_type = objDesc.fields_by_name.get(name[0])
    pref = False
    if config_type:
@@ -85,6 +87,7 @@ def getPref(config, comp_name):
    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
@@ -104,8 +107,11 @@ def setPref(config, comp_name, valStr):
    objDesc = config.DESCRIPTOR
    config_type = objDesc.fields_by_name.get(name[0])
    pref = False
-    if config_type:
+    if config_type and config_type.message_type is not None:
        pref = config_type.message_type.fields_by_name.get(snake_name)
+    # Others like ChannelSettings are standalone
+    elif config_type:
+        pref = config_type

    if (not pref) or (not config_type):
        return False
@@ -115,7 +121,7 @@ def setPref(config, comp_name, valStr):

    if snake_name == 'psk' and len(valStr) < 8:
        print(f"Warning: wifi.psk must be 8 or more characters.")
-        return 
+        return False

    enumType = pref.enum_type
    # pylint: disable=C0123
@@ -136,13 +142,16 @@ def setPref(config, comp_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:
-            config_values = getattr(config, config_type.name)
-            setattr(config_values, pref.name, val)
+            if config_type.message_type is not None:
+                config_values = getattr(config, config_type.name)
+                setattr(config_values, pref.name, val)
+            else:
+                setattr(config, snake_name, val)
        except TypeError:
            # The setter didn't like our arg type guess try again as a string
            config_values = getattr(config, config_type.name)
@@ -156,11 +165,12 @@ def setPref(config, comp_name, valStr):
            print(f"Adding '{val}' to the ignore_incoming list")
            config_type.message_type.ignore_incoming.extend([val])

+    prefix = f"{name[0]}." if config_type.message_type is not None else ""
    if Globals.getInstance().get_camel_case():
-        print(f"Set {name[0]}.{camel_name} to {valStr}")
+        print(f"Set {prefix}{camel_name} to {valStr}")
    else:
-        print(f"Set {name[0]}.{snake_name} to {valStr}")
-    
+        print(f"Set {prefix}{snake_name} to {valStr}")
+
    return True


@@ -184,21 +194,21 @@ def onConnected(interface):
            localConfig = interface.localNode.localConfig
            if args.setalt:
                alt = int(args.setalt)
-                localConfig.fixed_position = True
+                localConfig.position.fixed_position = True
                print(f"Fixing altitude at {alt} meters")
            if args.setlat:
                lat = float(args.setlat)
-                localConfig.fixed_position = True
+                localConfig.position.fixed_position = True
                print(f"Fixing latitude at {lat} degrees")
            if args.setlon:
                lon = float(args.setlon)
-                localConfig.fixed_position = True
+                localConfig.position.fixed_position = True
                print(f"Fixing longitude at {lon} degrees")

            print("Setting device position")
            # can include lat/long/alt etc: latitude = 37.5, longitude = -122.1
            interface.sendPosition(lat, lon, alt)
-            interface.localNode.writeConfig()
+            interface.localNode.writeConfig('position')
        elif not args.no_time:
            # We normally provide a current time to the mesh when we connect
            interface.sendPosition()
@@ -266,6 +276,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
@@ -327,6 +341,7 @@ def onConnected(interface):
            node = interface.getNode(args.dest)

            # Handle the int/float/bool arguments
+            pref = None
            for pref in args.set:
                found = setPref(node.localConfig, pref[0], pref[1])
                if not found:
@@ -334,12 +349,12 @@ def onConnected(interface):

            if found:
                print("Writing modified preferences to device")
-                interface.getNode(args.dest).writeConfig()
+                interface.getNode(args.dest).writeConfig(splitCompoundName(pref[0].lower())[0])
            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:
@@ -374,19 +389,19 @@ def onConnected(interface):

                    if 'alt' in configuration['location']:
                        alt = int(configuration['location']['alt'])
-                        localConfig.fixed_position = True
+                        localConfig.position.fixed_position = True
                        print(f"Fixing altitude at {alt} meters")
                    if 'lat' in configuration['location']:
                        lat = float(configuration['location']['lat'])
-                        localConfig.fixed_position = True
+                        localConfig.position.fixed_position = True
                        print(f"Fixing latitude at {lat} degrees")
                    if 'lon' in configuration['location']:
                        lon = float(configuration['location']['lon'])
-                        localConfig.fixed_position = True
+                        localConfig.position.fixed_position = True
                        print(f"Fixing longitude at {lon} degrees")
                    print("Setting device position")
                    interface.sendPosition(lat, lon, alt)
-                    interface.localNode.writeConfig()
+                    interface.localNode.writeConfig('position')

                if 'user_prefs' in configuration:
                    localConfig = interface.getNode(args.dest).localConfig
@@ -449,34 +464,32 @@ def onConnected(interface):

        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
+            # Overwrite modem_preset
            prefs = interface.getNode(args.dest).localConfig
-            prefs.lora.CopyFrom(chs)
-            interface.getNode(args.dest).writeConfig()
+            prefs.lora.modem_preset = modem_preset
+            interface.getNode(args.dest).writeConfig('lora')

        # handle the simple radio set commands
        if args.ch_vlongslow:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.VLongSlow)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.VERY_LONG_SLOW)

        if args.ch_longslow:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LongSlow)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LONG_SLOW)

        if args.ch_longfast:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LongFast)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LONG_FAST)

-        if args.ch_midslow:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MidSlow)
+        if args.ch_medslow:
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MEDIUM_SLOW)

-        if args.ch_midfast:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MidFast)
+        if args.ch_medfast:
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MEDIUM_FAST)

        if args.ch_shortslow:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.ShortSlow)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.SHORT_SLOW)

        if args.ch_shortfast:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.ShortFast)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.SHORT_FAST)

        if args.ch_set or args.ch_enable or args.ch_disable:
            closeNow = True
@@ -546,7 +559,7 @@ def onConnected(interface):
                    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")

        if args.nodes:
@@ -598,6 +611,8 @@ def subscribe():

 def export_config(interface):
    """used in--export-config"""
+    configObj = {}
+
    owner = interface.getLongName()
    owner_short = interface.getShortName()
    channel_url = interface.localNode.getURL()
@@ -611,38 +626,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.localConfig}'
-    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

@@ -818,10 +829,10 @@ def initParser():
        "--ch-longfast", help="Change to the long-range and fast channel", action='store_true')

    parser.add_argument(
-        "--ch-midslow", help="Change to the mid-range and slow channel", action='store_true')
+        "--ch-medslow", help="Change to the med-range and slow channel", action='store_true')

    parser.add_argument(
-        "--ch-midfast", help="Change to the mid-range and fast channel", action='store_true')
+        "--ch-medfast", help="Change to the med-range and fast channel", action='store_true')

    parser.add_argument(
        "--ch-shortslow", help="Change to the short-range and slow channel", action='store_true')
@@ -856,6 +867,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")
--- a/meshtastic/admin_pb2.py
+++ b/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\"\xd5\n\n\x0c\x41\x64minMessage\x12\x1d\n\x13get_channel_request\x18\x01 \x01(\rH\x00\x12(\n\x14get_channel_response\x18\x02 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_owner_request\x18\x03 \x01(\x08H\x00\x12#\n\x12get_owner_response\x18\x04 \x01(\x0b\x32\x05.UserH\x00\x12\x36\n\x12get_config_request\x18\x05 \x01(\x0e\x32\x18.AdminMessage.ConfigTypeH\x00\x12&\n\x13get_config_response\x18\x06 \x01(\x0b\x32\x07.ConfigH\x00\x12\x43\n\x19get_module_config_request\x18\x07 \x01(\x0e\x32\x1e.AdminMessage.ModuleConfigTypeH\x00\x12\x33\n\x1aget_module_config_response\x18\x08 \x01(\x0b\x32\r.ModuleConfigH\x00\x12!\n\x17get_all_channel_request\x18\t \x01(\x08H\x00\x12\x34\n*get_canned_message_module_messages_request\x18\n \x01(\x08H\x00\x12\x35\n+get_canned_message_module_messages_response\x18\x0b \x01(\tH\x00\x12%\n\x1bget_device_metadata_request\x18\x0c \x01(\rH\x00\x12\x37\n\x1cget_device_metadata_response\x18\r \x01(\x0b\x32\x0f.DeviceMetadataH\x00\x12\x1a\n\tset_owner\x18  \x01(\x0b\x32\x05.UserH\x00\x12\x1f\n\x0bset_channel\x18! \x01(\x0b\x32\x08.ChannelH\x00\x12\x1d\n\nset_config\x18\" \x01(\x0b\x32\x07.ConfigH\x00\x12*\n\x11set_module_config\x18# \x01(\x0b\x32\r.ModuleConfigH\x00\x12,\n\"set_canned_message_module_messages\x18$ \x01(\tH\x00\x12\x1c\n\x12\x63onfirm_set_config\x18@ \x01(\x08H\x00\x12#\n\x19\x63onfirm_set_module_config\x18\x41 \x01(\x08H\x00\x12\x1d\n\x13\x63onfirm_set_channel\x18\x42 \x01(\x08H\x00\x12\x1b\n\x11\x63onfirm_set_radio\x18\x43 \x01(\x08H\x00\x12\x18\n\x0e\x65xit_simulator\x18` \x01(\x08H\x00\x12\x18\n\x0ereboot_seconds\x18\x61 \x01(\x05H\x00\x12\x1a\n\x10shutdown_seconds\x18\x62 \x01(\x05H\x00\x12\x17\n\rfactory_reset\x18\x63 \x01(\x05H\x00\"\x95\x01\n\nConfigType\x12\x11\n\rDEVICE_CONFIG\x10\x00\x12\x13\n\x0fPOSITION_CONFIG\x10\x01\x12\x10\n\x0cPOWER_CONFIG\x10\x02\x12\x12\n\x0eNETWORK_CONFIG\x10\x03\x12\x12\n\x0e\x44ISPLAY_CONFIG\x10\x04\x12\x0f\n\x0bLORA_CONFIG\x10\x05\x12\x14\n\x10\x42LUETOOTH_CONFIG\x10\x06\"\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\x11\n\x0fpayload_variantBG\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=1466
+  _ADMINMESSAGE_CONFIGTYPE._serialized_start=1129
+  _ADMINMESSAGE_CONFIGTYPE._serialized_end=1278
+  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_start=1281
+  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_end=1447
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/cannedmessages_pb2.py
+++ b/meshtastic/cannedmessages_pb2.py
@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()



-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x63\x61nnedmessages.proto\"w\n\x19\x43\x61nnedMessageModuleConfig\x12\x15\n\rmessagesPart1\x18\x0b \x01(\t\x12\x15\n\rmessagesPart2\x18\x0c \x01(\t\x12\x15\n\rmessagesPart3\x18\r \x01(\t\x12\x15\n\rmessagesPart4\x18\x0e \x01(\tBU\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x63\x61nnedmessages.proto\"-\n\x19\x43\x61nnedMessageModuleConfig\x12\x10\n\x08messages\x18\x01 \x01(\tBU\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')



@@ -31,5 +31,5 @@ if _descriptor._USE_C_DESCRIPTORS == False:
  DESCRIPTOR._options = None
  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\031CannedMessageConfigProtosH\003Z!github.com/meshtastic/gomeshproto'
  _CANNEDMESSAGEMODULECONFIG._serialized_start=24
-  _CANNEDMESSAGEMODULECONFIG._serialized_end=143
+  _CANNEDMESSAGEMODULECONFIG._serialized_end=69
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/channel_pb2.py
+++ b/meshtastic/channel_pb2.py
@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()



-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\rchannel.proto\"\x7f\n\x0f\x43hannelSettings\x12\x13\n\x0b\x63hannel_num\x18\t \x01(\r\x12\x0b\n\x03psk\x18\x04 \x01(\x0c\x12\x0c\n\x04name\x18\x05 \x01(\t\x12\n\n\x02id\x18\n \x01(\x07\x12\x16\n\x0euplink_enabled\x18\x10 \x01(\x08\x12\x18\n\x10\x64ownlink_enabled\x18\x11 \x01(\x08\"\x8b\x01\n\x07\x43hannel\x12\r\n\x05index\x18\x01 \x01(\x05\x12\"\n\x08settings\x18\x02 \x01(\x0b\x32\x10.ChannelSettings\x12\x1b\n\x04role\x18\x03 \x01(\x0e\x32\r.Channel.Role\"0\n\x04Role\x12\x0c\n\x08\x44ISABLED\x10\x00\x12\x0b\n\x07PRIMARY\x10\x01\x12\r\n\tSECONDARY\x10\x02\x42I\n\x13\x63om.geeksville.meshB\rChannelProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\rchannel.proto\"\x7f\n\x0f\x43hannelSettings\x12\x13\n\x0b\x63hannel_num\x18\x01 \x01(\r\x12\x0b\n\x03psk\x18\x02 \x01(\x0c\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\n\n\x02id\x18\x04 \x01(\x07\x12\x16\n\x0euplink_enabled\x18\x05 \x01(\x08\x12\x18\n\x10\x64ownlink_enabled\x18\x06 \x01(\x08\"\x8b\x01\n\x07\x43hannel\x12\r\n\x05index\x18\x01 \x01(\x05\x12\"\n\x08settings\x18\x02 \x01(\x0b\x32\x10.ChannelSettings\x12\x1b\n\x04role\x18\x03 \x01(\x0e\x32\r.Channel.Role\"0\n\x04Role\x12\x0c\n\x08\x44ISABLED\x10\x00\x12\x0b\n\x07PRIMARY\x10\x01\x12\r\n\tSECONDARY\x10\x02\x42I\n\x13\x63om.geeksville.meshB\rChannelProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')



--- a/meshtastic/config_pb2.py
+++ b/meshtastic/config_pb2.py
@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()



-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x63onfig.proto\"\xf8\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\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\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\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')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x63onfig.proto\"\xfc\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\x07network\x18\x04 \x01(\x0b\x32\x15.Config.NetworkConfigH\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\x12,\n\tbluetooth\x18\x07 \x01(\x0b\x32\x17.Config.BluetoothConfigH\x00\x1a\xaf\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\x19\n\x11\x64\x65\x62ug_log_enabled\x18\x03 \x01(\x08\"B\n\x04Role\x12\n\n\x06\x43LIENT\x10\x00\x12\x0f\n\x0b\x43LIENT_MUTE\x10\x01\x12\n\n\x06ROUTER\x10\x02\x12\x11\n\rROUTER_CLIENT\x10\x03\x1a\x87\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\x04 \x01(\x08\x12\x1b\n\x13gps_update_interval\x18\x05 \x01(\r\x12\x18\n\x10gps_attempt_time\x18\x06 \x01(\r\x12\x16\n\x0eposition_flags\x18\x07 \x01(\r\"\xab\x01\n\rPositionFlags\x12\t\n\x05UNSET\x10\x00\x12\x0c\n\x08\x41LTITUDE\x10\x01\x12\x10\n\x0c\x41LTITUDE_MSL\x10\x02\x12\x16\n\x12GEOIDAL_SEPERATION\x10\x04\x12\x07\n\x03\x44OP\x10\x08\x12\t\n\x05HVDOP\x10\x10\x12\r\n\tSATINVIEW\x10 \x12\n\n\x06SEQ_NO\x10@\x12\x0e\n\tTIMESTAMP\x10\x80\x01\x12\x0c\n\x07HEADING\x10\x80\x02\x12\n\n\x05SPEED\x10\x80\x04\x1a\xe5\x01\n\x0bPowerConfig\x12\x17\n\x0fis_power_saving\x18\x01 \x01(\x08\x12&\n\x1eon_battery_shutdown_after_secs\x18\x02 \x01(\r\x12\x1f\n\x17\x61\x64\x63_multiplier_override\x18\x03 \x01(\x02\x12\x1b\n\x13wait_bluetooth_secs\x18\x04 \x01(\r\x12\x1d\n\x15mesh_sds_timeout_secs\x18\x05 \x01(\r\x12\x10\n\x08sds_secs\x18\x06 \x01(\r\x12\x0f\n\x07ls_secs\x18\x07 \x01(\r\x12\x15\n\rmin_wake_secs\x18\x08 \x01(\r\x1a\xd4\x01\n\rNetworkConfig\x12\x14\n\x0cwifi_enabled\x18\x01 \x01(\x08\x12\x31\n\twifi_mode\x18\x02 \x01(\x0e\x32\x1e.Config.NetworkConfig.WiFiMode\x12\x11\n\twifi_ssid\x18\x03 \x01(\t\x12\x10\n\x08wifi_psk\x18\x04 \x01(\t\x12\x12\n\nntp_server\x18\x05 \x01(\t\"A\n\x08WiFiMode\x12\n\n\x06\x43LIENT\x10\x00\x12\x10\n\x0c\x41\x43\x43\x45SS_POINT\x10\x01\x12\x17\n\x13\x41\x43\x43\x45SS_POINT_HIDDEN\x10\x02\x1a\xf3\x01\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\"M\n\x13GpsCoordinateFormat\x12\x07\n\x03\x44\x45\x43\x10\x00\x12\x07\n\x03\x44MS\x10\x01\x12\x07\n\x03UTM\x10\x02\x12\x08\n\x04MGRS\x10\x03\x12\x07\n\x03OLC\x10\x04\x12\x08\n\x04OSGR\x10\x05\x1a\xa8\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\"\x84\x01\n\nRegionCode\x12\t\n\x05UNSET\x10\x00\x12\x06\n\x02US\x10\x01\x12\n\n\x06\x45U_433\x10\x02\x12\n\n\x06\x45U_868\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\n\n\x06NZ_865\x10\x0b\x12\x06\n\x02TH\x10\x0c\"\x81\x01\n\x0bModemPreset\x12\r\n\tLONG_FAST\x10\x00\x12\r\n\tLONG_SLOW\x10\x01\x12\x12\n\x0eVERY_LONG_SLOW\x10\x02\x12\x0f\n\x0bMEDIUM_SLOW\x10\x03\x12\x0f\n\x0bMEDIUM_FAST\x10\x04\x12\x0e\n\nSHORT_SLOW\x10\x05\x12\x0e\n\nSHORT_FAST\x10\x06\x1a\xa2\x01\n\x0f\x42luetoothConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x31\n\x04mode\x18\x02 \x01(\x0e\x32#.Config.BluetoothConfig.PairingMode\x12\x11\n\tfixed_pin\x18\x03 \x01(\r\"8\n\x0bPairingMode\x12\x0e\n\nRANDOM_PIN\x10\x00\x12\r\n\tFIXED_PIN\x10\x01\x12\n\n\x06NO_PIN\x10\x02\x42\x11\n\x0fpayload_variantBH\n\x13\x63om.geeksville.meshB\x0c\x43onfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')



@@ -22,15 +22,17 @@ _CONFIG = DESCRIPTOR.message_types_by_name['Config']
 _CONFIG_DEVICECONFIG = _CONFIG.nested_types_by_name['DeviceConfig']
 _CONFIG_POSITIONCONFIG = _CONFIG.nested_types_by_name['PositionConfig']
 _CONFIG_POWERCONFIG = _CONFIG.nested_types_by_name['PowerConfig']
-_CONFIG_WIFICONFIG = _CONFIG.nested_types_by_name['WiFiConfig']
+_CONFIG_NETWORKCONFIG = _CONFIG.nested_types_by_name['NetworkConfig']
 _CONFIG_DISPLAYCONFIG = _CONFIG.nested_types_by_name['DisplayConfig']
 _CONFIG_LORACONFIG = _CONFIG.nested_types_by_name['LoRaConfig']
+_CONFIG_BLUETOOTHCONFIG = _CONFIG.nested_types_by_name['BluetoothConfig']
 _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_NETWORKCONFIG_WIFIMODE = _CONFIG_NETWORKCONFIG.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']
+_CONFIG_BLUETOOTHCONFIG_PAIRINGMODE = _CONFIG_BLUETOOTHCONFIG.enum_types_by_name['PairingMode']
 Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), {

  'DeviceConfig' : _reflection.GeneratedProtocolMessageType('DeviceConfig', (_message.Message,), {
@@ -54,10 +56,10 @@ Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,),
    })
  ,

-  'WiFiConfig' : _reflection.GeneratedProtocolMessageType('WiFiConfig', (_message.Message,), {
-    'DESCRIPTOR' : _CONFIG_WIFICONFIG,
+  'NetworkConfig' : _reflection.GeneratedProtocolMessageType('NetworkConfig', (_message.Message,), {
+    'DESCRIPTOR' : _CONFIG_NETWORKCONFIG,
    '__module__' : 'config_pb2'
-    # @@protoc_insertion_point(class_scope:Config.WiFiConfig)
+    # @@protoc_insertion_point(class_scope:Config.NetworkConfig)
    })
  ,

@@ -74,6 +76,13 @@ Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,),
    # @@protoc_insertion_point(class_scope:Config.LoRaConfig)
    })
  ,
+
+  'BluetoothConfig' : _reflection.GeneratedProtocolMessageType('BluetoothConfig', (_message.Message,), {
+    'DESCRIPTOR' : _CONFIG_BLUETOOTHCONFIG,
+    '__module__' : 'config_pb2'
+    # @@protoc_insertion_point(class_scope:Config.BluetoothConfig)
+    })
+  ,
  'DESCRIPTOR' : _CONFIG,
  '__module__' : 'config_pb2'
  # @@protoc_insertion_point(class_scope:Config)
@@ -82,38 +91,43 @@ _sym_db.RegisterMessage(Config)
 _sym_db.RegisterMessage(Config.DeviceConfig)
 _sym_db.RegisterMessage(Config.PositionConfig)
 _sym_db.RegisterMessage(Config.PowerConfig)
-_sym_db.RegisterMessage(Config.WiFiConfig)
+_sym_db.RegisterMessage(Config.NetworkConfig)
 _sym_db.RegisterMessage(Config.DisplayConfig)
 _sym_db.RegisterMessage(Config.LoRaConfig)
+_sym_db.RegisterMessage(Config.BluetoothConfig)

 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=2313
-  _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=907
-  _CONFIG_POSITIONCONFIG_POSITIONFLAGS._serialized_start=703
-  _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=1412
-  _CONFIG_WIFICONFIG._serialized_end=1487
-  _CONFIG_DISPLAYCONFIG._serialized_start=1490
-  _CONFIG_DISPLAYCONFIG._serialized_end=1761
-  _CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT._serialized_start=1630
-  _CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT._serialized_end=1761
-  _CONFIG_LORACONFIG._serialized_start=1764
-  _CONFIG_LORACONFIG._serialized_end=2295
-  _CONFIG_LORACONFIG_REGIONCODE._serialized_start=2052
-  _CONFIG_LORACONFIG_REGIONCODE._serialized_end=2181
-  _CONFIG_LORACONFIG_MODEMPRESET._serialized_start=2183
-  _CONFIG_LORACONFIG_MODEMPRESET._serialized_end=2295
+  _CONFIG._serialized_end=2317
+  _CONFIG_DEVICECONFIG._serialized_start=316
+  _CONFIG_DEVICECONFIG._serialized_end=491
+  _CONFIG_DEVICECONFIG_ROLE._serialized_start=425
+  _CONFIG_DEVICECONFIG_ROLE._serialized_end=491
+  _CONFIG_POSITIONCONFIG._serialized_start=494
+  _CONFIG_POSITIONCONFIG._serialized_end=885
+  _CONFIG_POSITIONCONFIG_POSITIONFLAGS._serialized_start=714
+  _CONFIG_POSITIONCONFIG_POSITIONFLAGS._serialized_end=885
+  _CONFIG_POWERCONFIG._serialized_start=888
+  _CONFIG_POWERCONFIG._serialized_end=1117
+  _CONFIG_NETWORKCONFIG._serialized_start=1120
+  _CONFIG_NETWORKCONFIG._serialized_end=1332
+  _CONFIG_NETWORKCONFIG_WIFIMODE._serialized_start=1267
+  _CONFIG_NETWORKCONFIG_WIFIMODE._serialized_end=1332
+  _CONFIG_DISPLAYCONFIG._serialized_start=1335
+  _CONFIG_DISPLAYCONFIG._serialized_end=1578
+  _CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT._serialized_start=1501
+  _CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT._serialized_end=1578
+  _CONFIG_LORACONFIG._serialized_start=1581
+  _CONFIG_LORACONFIG._serialized_end=2133
+  _CONFIG_LORACONFIG_REGIONCODE._serialized_start=1869
+  _CONFIG_LORACONFIG_REGIONCODE._serialized_end=2001
+  _CONFIG_LORACONFIG_MODEMPRESET._serialized_start=2004
+  _CONFIG_LORACONFIG_MODEMPRESET._serialized_end=2133
+  _CONFIG_BLUETOOTHCONFIG._serialized_start=2136
+  _CONFIG_BLUETOOTHCONFIG._serialized_end=2298
+  _CONFIG_BLUETOOTHCONFIG_PAIRINGMODE._serialized_start=2242
+  _CONFIG_BLUETOOTHCONFIG_PAIRINGMODE._serialized_end=2298
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/device_metadata_pb2.py
+++ b/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)
--- a/meshtastic/deviceonly_pb2.py
+++ b/meshtastic/deviceonly_pb2.py
@@ -17,7 +17,7 @@ from . import channel_pb2 as channel__pb2
 from . import mesh_pb2 as mesh__pb2


-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10\x64\x65viceonly.proto\x1a\rchannel.proto\x1a\nmesh.proto\"\xe6\x01\n\x0b\x44\x65viceState\x12\x1c\n\x07my_node\x18\x02 \x01(\x0b\x32\x0b.MyNodeInfo\x12\x14\n\x05owner\x18\x03 \x01(\x0b\x32\x05.User\x12\x1a\n\x07node_db\x18\x04 \x03(\x0b\x32\t.NodeInfo\x12\"\n\rreceive_queue\x18\x05 \x03(\x0b\x32\x0b.MeshPacket\x12\x0f\n\x07version\x18\x08 \x01(\r\x12$\n\x0frx_text_message\x18\x07 \x01(\x0b\x32\x0b.MeshPacket\x12\x0f\n\x07no_save\x18\t \x01(\x08\x12\x15\n\rdid_gps_reset\x18\x0b \x01(\x08J\x04\x08\x0c\x10\r\":\n\x0b\x43hannelFile\x12\x1a\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x08.Channel\x12\x0f\n\x07version\x18\x02 \x01(\r\"\x84\x01\n\x08OEMStore\x12\x16\n\x0eoem_icon_width\x18\x01 \x01(\r\x12\x17\n\x0foem_icon_height\x18\x02 \x01(\r\x12\x15\n\roem_icon_bits\x18\x03 \x01(\x0c\x12\x1e\n\x08oem_font\x18\x04 \x01(\x0e\x32\x0c.ScreenFonts\x12\x10\n\x08oem_text\x18\x05 \x01(\t*>\n\x0bScreenFonts\x12\x0e\n\nFONT_SMALL\x10\x00\x12\x0f\n\x0b\x46ONT_MEDIUM\x10\x01\x12\x0e\n\nFONT_LARGE\x10\x02\x42\x46\n\x13\x63om.geeksville.meshB\nDeviceOnlyH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10\x64\x65viceonly.proto\x1a\rchannel.proto\x1a\nmesh.proto\"\xe0\x01\n\x0b\x44\x65viceState\x12\x1c\n\x07my_node\x18\x02 \x01(\x0b\x32\x0b.MyNodeInfo\x12\x14\n\x05owner\x18\x03 \x01(\x0b\x32\x05.User\x12\x1a\n\x07node_db\x18\x04 \x03(\x0b\x32\t.NodeInfo\x12\"\n\rreceive_queue\x18\x05 \x03(\x0b\x32\x0b.MeshPacket\x12\x0f\n\x07version\x18\x08 \x01(\r\x12$\n\x0frx_text_message\x18\x07 \x01(\x0b\x32\x0b.MeshPacket\x12\x0f\n\x07no_save\x18\t \x01(\x08\x12\x15\n\rdid_gps_reset\x18\x0b \x01(\x08\":\n\x0b\x43hannelFile\x12\x1a\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x08.Channel\x12\x0f\n\x07version\x18\x02 \x01(\r\"\x84\x01\n\x08OEMStore\x12\x16\n\x0eoem_icon_width\x18\x01 \x01(\r\x12\x17\n\x0foem_icon_height\x18\x02 \x01(\r\x12\x15\n\roem_icon_bits\x18\x03 \x01(\x0c\x12\x1e\n\x08oem_font\x18\x04 \x01(\x0e\x32\x0c.ScreenFonts\x12\x10\n\x08oem_text\x18\x05 \x01(\t*>\n\x0bScreenFonts\x12\x0e\n\nFONT_SMALL\x10\x00\x12\x0f\n\x0b\x46ONT_MEDIUM\x10\x01\x12\x0e\n\nFONT_LARGE\x10\x02\x42\x46\n\x13\x63om.geeksville.meshB\nDeviceOnlyH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')

 _SCREENFONTS = DESCRIPTOR.enum_types_by_name['ScreenFonts']
 ScreenFonts = enum_type_wrapper.EnumTypeWrapper(_SCREENFONTS)
@@ -54,12 +54,12 @@ if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nDeviceOnlyH\003Z!github.com/meshtastic/gomeshproto'
-  _SCREENFONTS._serialized_start=475
-  _SCREENFONTS._serialized_end=537
+  _SCREENFONTS._serialized_start=469
+  _SCREENFONTS._serialized_end=531
  _DEVICESTATE._serialized_start=48
-  _DEVICESTATE._serialized_end=278
-  _CHANNELFILE._serialized_start=280
-  _CHANNELFILE._serialized_end=338
-  _OEMSTORE._serialized_start=341
-  _OEMSTORE._serialized_end=473
+  _DEVICESTATE._serialized_end=272
+  _CHANNELFILE._serialized_start=274
+  _CHANNELFILE._serialized_end=332
+  _OEMSTORE._serialized_start=335
+  _OEMSTORE._serialized_end=467
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/localonly_pb2.py
+++ b/meshtastic/localonly_pb2.py
@@ -16,7 +16,7 @@ from . import config_pb2 as config__pb2
 from . import module_config_pb2 as module__config__pb2


-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0flocalonly.proto\x1a\x0c\x63onfig.proto\x1a\x13module_config.proto\"\xfe\x01\n\x0bLocalConfig\x12$\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x14.Config.DeviceConfig\x12(\n\x08position\x18\x02 \x01(\x0b\x32\x16.Config.PositionConfig\x12\"\n\x05power\x18\x03 \x01(\x0b\x32\x13.Config.PowerConfig\x12 \n\x04wifi\x18\x04 \x01(\x0b\x32\x12.Config.WiFiConfig\x12&\n\x07\x64isplay\x18\x05 \x01(\x0b\x32\x15.Config.DisplayConfig\x12 \n\x04lora\x18\x06 \x01(\x0b\x32\x12.Config.LoRaConfig\x12\x0f\n\x07version\x18\x07 \x01(\r\"\x9a\x03\n\x11LocalModuleConfig\x12&\n\x04mqtt\x18\x01 \x01(\x0b\x32\x18.ModuleConfig.MQTTConfig\x12*\n\x06serial\x18\x02 \x01(\x0b\x32\x1a.ModuleConfig.SerialConfig\x12G\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32(.ModuleConfig.ExternalNotificationConfig\x12\x37\n\rstore_forward\x18\x04 \x01(\x0b\x32 .ModuleConfig.StoreForwardConfig\x12\x31\n\nrange_test\x18\x05 \x01(\x0b\x32\x1d.ModuleConfig.RangeTestConfig\x12\x30\n\ttelemetry\x18\x06 \x01(\x0b\x32\x1d.ModuleConfig.TelemetryConfig\x12\x39\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32!.ModuleConfig.CannedMessageConfig\x12\x0f\n\x07version\x18\x08 \x01(\rBK\n\x13\x63om.geeksville.meshB\x0fLocalOnlyProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0flocalonly.proto\x1a\x0c\x63onfig.proto\x1a\x13module_config.proto\"\xb0\x02\n\x0bLocalConfig\x12$\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x14.Config.DeviceConfig\x12(\n\x08position\x18\x02 \x01(\x0b\x32\x16.Config.PositionConfig\x12\"\n\x05power\x18\x03 \x01(\x0b\x32\x13.Config.PowerConfig\x12&\n\x07network\x18\x04 \x01(\x0b\x32\x15.Config.NetworkConfig\x12&\n\x07\x64isplay\x18\x05 \x01(\x0b\x32\x15.Config.DisplayConfig\x12 \n\x04lora\x18\x06 \x01(\x0b\x32\x12.Config.LoRaConfig\x12*\n\tbluetooth\x18\x07 \x01(\x0b\x32\x17.Config.BluetoothConfig\x12\x0f\n\x07version\x18\x08 \x01(\r\"\x9a\x03\n\x11LocalModuleConfig\x12&\n\x04mqtt\x18\x01 \x01(\x0b\x32\x18.ModuleConfig.MQTTConfig\x12*\n\x06serial\x18\x02 \x01(\x0b\x32\x1a.ModuleConfig.SerialConfig\x12G\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32(.ModuleConfig.ExternalNotificationConfig\x12\x37\n\rstore_forward\x18\x04 \x01(\x0b\x32 .ModuleConfig.StoreForwardConfig\x12\x31\n\nrange_test\x18\x05 \x01(\x0b\x32\x1d.ModuleConfig.RangeTestConfig\x12\x30\n\ttelemetry\x18\x06 \x01(\x0b\x32\x1d.ModuleConfig.TelemetryConfig\x12\x39\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32!.ModuleConfig.CannedMessageConfig\x12\x0f\n\x07version\x18\x08 \x01(\rBK\n\x13\x63om.geeksville.meshB\x0fLocalOnlyProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')



@@ -41,7 +41,7 @@ if _descriptor._USE_C_DESCRIPTORS == False:
  DESCRIPTOR._options = None
  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\017LocalOnlyProtosH\003Z!github.com/meshtastic/gomeshproto'
  _LOCALCONFIG._serialized_start=55
-  _LOCALCONFIG._serialized_end=309
-  _LOCALMODULECONFIG._serialized_start=312
-  _LOCALMODULECONFIG._serialized_end=722
+  _LOCALCONFIG._serialized_end=359
+  _LOCALMODULECONFIG._serialized_start=362
+  _LOCALMODULECONFIG._serialized_end=772
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/mesh_interface.py
+++ b/meshtastic/mesh_interface.py
@@ -532,17 +532,17 @@ 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 or fromRadio.moduleConfig:
            if fromRadio.config.HasField("device"):
                self.localNode.localConfig.device.CopyFrom(fromRadio.config.device)
@@ -550,13 +550,15 @@ class MeshInterface:
                self.localNode.localConfig.position.CopyFrom(fromRadio.config.position)
            elif fromRadio.config.HasField("power"):
                self.localNode.localConfig.power.CopyFrom(fromRadio.config.power)
-            elif fromRadio.config.HasField("wifi"):
-                self.localNode.localConfig.wifi.CopyFrom(fromRadio.config.wifi)
+            elif fromRadio.config.HasField("network"):
+                self.localNode.localConfig.network.CopyFrom(fromRadio.config.network)
            elif fromRadio.config.HasField("display"):
                self.localNode.localConfig.display.CopyFrom(fromRadio.config.display)
            elif fromRadio.config.HasField("lora"):
                self.localNode.localConfig.lora.CopyFrom(fromRadio.config.lora)
-            
+            elif fromRadio.config.HasField("bluetooth"):
+                self.localNode.localConfig.bluetooth.CopyFrom(fromRadio.config.bluetooth)
+
            elif fromRadio.moduleConfig.HasField("mqtt"):
                self.localNode.moduleConfig.mqtt.CopyFrom(fromRadio.moduleConfig.mqtt)
            elif fromRadio.moduleConfig.HasField("serial"):
@@ -569,7 +571,7 @@ class MeshInterface:
                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")

@@ -673,7 +675,7 @@ class MeshInterface:
        # UNKNOWN_APP is the default protobuf portnum value, and therefore if not
        # set it will not be populated at all to make API usage easier, set
        # it to prevent confusion
-        if "portnum" not in decoded:
+        if decoded and "portnum" not in decoded:
            new_portnum = portnums_pb2.PortNum.Name(portnums_pb2.PortNum.UNKNOWN_APP)
            decoded["portnum"] = new_portnum
            logging.warning(f"portnum was not in decoded. Setting to:{new_portnum}")
--- a/meshtastic/mesh_pb2.py
+++ b/meshtastic/mesh_pb2.py
--- a/meshtastic/module_config_pb2.py
+++ b/meshtastic/module_config_pb2.py
@@ -12,10 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
 _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\"\x90\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\x1a\x84\x01\n\nMQTTConfig\x12\x0f\n\x07\x65nabled\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\x12\x14\n\x0cjson_enabled\x18\x06 \x01(\x08\x1a\x84\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\"1\n\x0bSerial_Mode\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\n\n\x06SIMPLE\x10\x01\x12\t\n\x05PROTO\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\x05 \x01(\x08\x1a\xb5\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\"c\n\x0eInputEventChar\x12\x08\n\x04NONE\x10\x00\x12\x06\n\x02UP\x10\x11\x12\x08\n\x04\x44OWN\x10\x12\x12\x08\n\x04LEFT\x10\x13\x12\t\n\x05RIGHT\x10\x14\x12\n\n\x06SELECT\x10\n\x12\x08\n\x04\x42\x41\x43K\x10\x1b\x12\n\n\x06\x43\x41NCEL\x10\x18\x42\x11\n\x0fpayload_variantBN\n\x13\x63om.geeksville.meshB\x12ModuleConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')



@@ -97,26 +96,26 @@ 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_MQTTCONFIG._serialized_start=445
-  _MODULECONFIG_MQTTCONFIG._serialized_end=556
-  _MODULECONFIG_SERIALCONFIG._serialized_start=559
-  _MODULECONFIG_SERIALCONFIG._serialized_end=1090
-  _MODULECONFIG_SERIALCONFIG_SERIAL_BAUD._serialized_start=758
-  _MODULECONFIG_SERIALCONFIG_SERIAL_BAUD._serialized_end=1024
-  _MODULECONFIG_SERIALCONFIG_SERIAL_MODE._serialized_start=1026
-  _MODULECONFIG_SERIALCONFIG_SERIAL_MODE._serialized_end=1090
-  _MODULECONFIG_EXTERNALNOTIFICATIONCONFIG._serialized_start=1093
-  _MODULECONFIG_EXTERNALNOTIFICATIONCONFIG._serialized_end=1232
-  _MODULECONFIG_STOREFORWARDCONFIG._serialized_start=1235
-  _MODULECONFIG_STOREFORWARDCONFIG._serialized_end=1367
-  _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._serialized_start=24
+  _MODULECONFIG._serialized_end=2216
+  _MODULECONFIG_MQTTCONFIG._serialized_start=429
+  _MODULECONFIG_MQTTCONFIG._serialized_end=561
+  _MODULECONFIG_SERIALCONFIG._serialized_start=564
+  _MODULECONFIG_SERIALCONFIG._serialized_end=1080
+  _MODULECONFIG_SERIALCONFIG_SERIAL_BAUD._serialized_start=763
+  _MODULECONFIG_SERIALCONFIG_SERIAL_BAUD._serialized_end=1029
+  _MODULECONFIG_SERIALCONFIG_SERIAL_MODE._serialized_start=1031
+  _MODULECONFIG_SERIALCONFIG_SERIAL_MODE._serialized_end=1080
+  _MODULECONFIG_EXTERNALNOTIFICATIONCONFIG._serialized_start=1083
+  _MODULECONFIG_EXTERNALNOTIFICATIONCONFIG._serialized_end=1222
+  _MODULECONFIG_STOREFORWARDCONFIG._serialized_start=1225
+  _MODULECONFIG_STOREFORWARDCONFIG._serialized_end=1357
+  _MODULECONFIG_RANGETESTCONFIG._serialized_start=1359
+  _MODULECONFIG_RANGETESTCONFIG._serialized_end=1423
+  _MODULECONFIG_TELEMETRYCONFIG._serialized_start=1426
+  _MODULECONFIG_TELEMETRYCONFIG._serialized_end=1629
+  _MODULECONFIG_CANNEDMESSAGECONFIG._serialized_start=1632
+  _MODULECONFIG_CANNEDMESSAGECONFIG._serialized_end=2197
+  _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR._serialized_start=2098
+  _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR._serialized_end=2197
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/node.py
+++ b/meshtastic/node.py
@@ -25,13 +25,9 @@ class Node:
        self._timeout = Timeout(maxSecs=300)
        self.partialChannels = None
        self.noProto = noProto
-
        self.cannedPluginMessage = None

-        self.cannedPluginMessagePart1 = None
-        self.cannedPluginMessagePart2 = None
-        self.cannedPluginMessagePart3 = None
-        self.cannedPluginMessagePart4 = None
+        self.cannedPluginMessageMessages = None

        self.gotResponse = None

@@ -92,91 +88,139 @@ class Node:
            p.set_config.device.CopyFrom(self.localConfig.device)
            self._sendAdmin(p)
            logging.debug("Wrote device")
-            time.sleep(0.1)
+            time.sleep(0.3)

        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)
+            time.sleep(0.3)

        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)
+            time.sleep(0.3)

-        if self.localConfig.wifi:
+        if self.localConfig.network:
            p = admin_pb2.AdminMessage()
-            p.set_config.wifi.CopyFrom(self.localConfig.wifi)
+            p.set_config.network.CopyFrom(self.localConfig.network)
            self._sendAdmin(p)
-            logging.debug("Wrote wifi")
-            time.sleep(0.1)
+            logging.debug("Wrote network")
+            time.sleep(0.3)

        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)
+            time.sleep(0.3)

        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)
+            time.sleep(0.3)
+
+        if self.localConfig.bluetooth:
+            p = admin_pb2.AdminMessage()
+            p.set_config.bluetooth.CopyFrom(self.localConfig.bluetooth)
+            self._sendAdmin(p)
+            logging.debug("Wrote bluetooth")
+            time.sleep(0.3)

        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)
+            time.sleep(0.3)

        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)
+            time.sleep(0.3)

        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)
+            time.sleep(0.3)
        
        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)
+            time.sleep(0.3)
        
        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)
+            time.sleep(0.3)

        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)
+            time.sleep(0.3)

        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)
+            time.sleep(0.3)
+
+    def writeConfig(self, config_name):
+        """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()
+
+        if config_name == 'device':
+            p.set_config.device.CopyFrom(self.localConfig.device)
+        elif config_name == 'position':
+            p.set_config.position.CopyFrom(self.localConfig.position)
+        elif config_name == 'power':
+            p.set_config.power.CopyFrom(self.localConfig.power)
+        elif config_name == 'network':
+            p.set_config.network.CopyFrom(self.localConfig.network)
+        elif config_name == 'display':
+            p.set_config.display.CopyFrom(self.localConfig.display)
+        elif config_name == 'lora':
+            p.set_config.lora.CopyFrom(self.localConfig.lora)
+        elif config_name == 'bluetooth':
+            p.set_config.bluetooth.CopyFrom(self.localConfig.bluetooth)
+        elif config_name == 'mqtt':
+            p.set_module_config.mqtt.CopyFrom(self.moduleConfig.mqtt)
+        elif config_name == 'serial':
+            p.set_module_config.serial.CopyFrom(self.moduleConfig.serial)
+        elif config_name == 'external_notification':
+            p.set_module_config.external_notification.CopyFrom(self.moduleConfig.external_notification)
+        elif config_name == 'store_forward':
+            p.set_module_config.store_forward.CopyFrom(self.moduleConfig.store_forward)
+        elif config_name == 'range_test':
+            p.set_module_config.range_test.CopyFrom(self.moduleConfig.range_test)
+        elif config_name == 'telemetry':
+            p.set_module_config.telemetry.CopyFrom(self.moduleConfig.telemetry)
+        elif config_name == 'canned_message':
+            p.set_module_config.canned_message.CopyFrom(self.moduleConfig.canned_message)
+        else:
+            our_exit(f"Error: No valid config with name {config_name}")
+        
+        logging.debug(f"Wrote: {config_name}")
+        self._sendAdmin(p)

    def writeChannel(self, channelIndex, adminIndex=0):
        """Write the current (edited) channel to the device"""
@@ -287,9 +331,12 @@ class Node:
            for c in self.channels:
                if c.role == channel_pb2.Channel.Role.PRIMARY or (includeAll and c.role == channel_pb2.Channel.Role.SECONDARY):
                    channelSet.settings.append(c.settings)
+
+        channelSet.lora_config.CopyFrom(self.localConfig.lora)
        some_bytes = channelSet.SerializeToString()
        s = base64.urlsafe_b64encode(some_bytes).decode('ascii')
-        return f"https://www.meshtastic.org/e/#{s}".replace("=", "")
+        s = s.replace("=", "").replace("+", "-").replace("/", "_")
+        return f"https://www.meshtastic.org/e/#{s}"

    def setURL(self, url):
        """Set mesh network URL"""
@@ -327,9 +374,13 @@ class Node:
            self.writeChannel(ch.index)
            i = i + 1

-    def onResponseRequestCannedMessagePluginMessagePart1(self, p):
+        p = admin_pb2.AdminMessage()
+        p.set_config.lora.CopyFrom(channelSet.lora_config)
+        self._sendAdmin(p)
+
+    def onResponseRequestCannedMessagePluginMessageMessages(self, p):
        """Handle the response packet for requesting canned message plugin message part 1"""
-        logging.debug(f'onResponseRequestCannedMessagePluginMessagePart1() p:{p}')
+        logging.debug(f'onResponseRequestCannedMessagePluginMessageMessages() p:{p}')
        errorFound = False
        if "routing" in p["decoded"]:
            if p["decoded"]["routing"]["errorReason"] != "NONE":
@@ -339,57 +390,10 @@ class Node:
            if "decoded" in p:
                if "admin" in p["decoded"]:
                    if "raw" in p["decoded"]["admin"]:
-                        self.cannedPluginMessagePart1 = p["decoded"]["admin"]["raw"].get_canned_message_module_part1_response
-                        logging.debug(f'self.cannedPluginMessagePart1:{self.cannedPluginMessagePart1}')
+                        self.cannedPluginMessageMessages = p["decoded"]["admin"]["raw"].get_canned_message_module_messages_response
+                        logging.debug(f'self.cannedPluginMessageMessages:{self.cannedPluginMessageMessages}')
                        self.gotResponse = True

-    def onResponseRequestCannedMessagePluginMessagePart2(self, p):
-        """Handle the response packet for requesting canned message plugin message part 2"""
-        logging.debug(f'onResponseRequestCannedMessagePluginMessagePart2() 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"]}')
-        if errorFound is False:
-            if "decoded" in p:
-                if "admin" in p["decoded"]:
-                    if "raw" in p["decoded"]["admin"]:
-                        self.cannedPluginMessagePart2 = p["decoded"]["admin"]["raw"].get_canned_message_module_part2_response
-                        logging.debug(f'self.cannedPluginMessagePart2:{self.cannedPluginMessagePart2}')
-                        self.gotResponse = True
-
-    def onResponseRequestCannedMessagePluginMessagePart3(self, p):
-        """Handle the response packet for requesting canned message plugin message part 3"""
-        logging.debug(f'onResponseRequestCannedMessagePluginMessagePart3() 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"]}')
-        if errorFound is False:
-            if "decoded" in p:
-                if "admin" in p["decoded"]:
-                    if "raw" in p["decoded"]["admin"]:
-                        self.cannedPluginMessagePart3 = p["decoded"]["admin"]["raw"].get_canned_message_module_part3_response
-                        logging.debug(f'self.cannedPluginMessagePart3:{self.cannedPluginMessagePart3}')
-                        self.gotResponse = True
-
-    def onResponseRequestCannedMessagePluginMessagePart4(self, p):
-        """Handle the response packet for requesting canned message plugin message part 4"""
-        logging.debug(f'onResponseRequestCannedMessagePluginMessagePart4() 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"]}')
-        if errorFound is False:
-            if "decoded" in p:
-                if "admin" in p["decoded"]:
-                    if "raw" in p["decoded"]["admin"]:
-                        self.cannedPluginMessagePart4 = p["decoded"]["admin"]["raw"].get_canned_message_module_part4_response
-                        logging.debug(f'self.cannedPluginMessagePart4:{self.cannedPluginMessagePart4}')
-                        self.gotResponse = True

    def get_canned_message(self):
        """Get the canned message string. Concatenate all pieces together and return a single string."""
@@ -397,61 +401,27 @@ class Node:
        if not self.cannedPluginMessage:

            p1 = admin_pb2.AdminMessage()
-            p1.get_canned_message_module_part1_request = True
+            p1.get_canned_message_module_messages_request = True
            self.gotResponse = False
-            self._sendAdmin(p1, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart1)
+            self._sendAdmin(p1, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessageMessages)
            while self.gotResponse is False:
                time.sleep(0.1)

-            p2 = admin_pb2.AdminMessage()
-            p2.get_canned_message_module_part2_request = True
-            self.gotResponse = False
-            self._sendAdmin(p2, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart2)
-            while self.gotResponse is False:
-                time.sleep(0.1)
-
-            p3 = admin_pb2.AdminMessage()
-            p3.get_canned_message_module_part3_request = True
-            self.gotResponse = False
-            self._sendAdmin(p3, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart3)
-            while self.gotResponse is False:
-                time.sleep(0.1)
-
-            p4 = admin_pb2.AdminMessage()
-            p4.get_canned_message_module_part4_request = True
-            self.gotResponse = False
-            self._sendAdmin(p4, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart4)
-            while self.gotResponse is False:
-                time.sleep(0.1)
-
-            # TODO: This feels wrong to have a sleep here. Is there a way to ensure that
-            # all requests are complete? Perhaps change to a while loop any parts are None... maybe?
-            time.sleep(3)
-
-            logging.debug(f'self.cannedPluginMessagePart1:{self.cannedPluginMessagePart1}')
-            logging.debug(f'self.cannedPluginMessagePart2:{self.cannedPluginMessagePart2}')
-            logging.debug(f'self.cannedPluginMessagePart3:{self.cannedPluginMessagePart3}')
-            logging.debug(f'self.cannedPluginMessagePart4:{self.cannedPluginMessagePart4}')
+            logging.debug(f'self.cannedPluginMessageMessages:{self.cannedPluginMessageMessages}')

            self.cannedPluginMessage = ""
-            if self.cannedPluginMessagePart1:
-                self.cannedPluginMessage += self.cannedPluginMessagePart1
-            if self.cannedPluginMessagePart2:
-                self.cannedPluginMessage += self.cannedPluginMessagePart2
-            if self.cannedPluginMessagePart3:
-                self.cannedPluginMessage += self.cannedPluginMessagePart3
-            if self.cannedPluginMessagePart4:
-                self.cannedPluginMessage += self.cannedPluginMessagePart4
+            if self.cannedPluginMessageMessages:
+                self.cannedPluginMessage += self.cannedPluginMessageMessages

        print(f'canned_plugin_message:{self.cannedPluginMessage}')
        logging.debug(f'canned_plugin_message:{self.cannedPluginMessage}')
        return self.cannedPluginMessage

    def set_canned_message(self, message):
-        """Set the canned message. Split into parts of 200 chars each."""
+        """Set the canned message. The canned messages length must be less than 200 character."""

-        if len(message) > 800:
-            our_exit("Warning: The canned message must be less than 800 characters.")
+        if len(message) > 200:
+            our_exit("Warning: The canned message must be less than 200 characters.")

        # split into chunks
        chunks = []
@@ -466,13 +436,7 @@ class Node:

            # TODO: should be a way to improve this
            if i == 0:
-                p.set_canned_message_module_part1 = chunk
-            elif i == 1:
-                p.set_canned_message_module_part2 = chunk
-            elif i == 2:
-                p.set_canned_message_module_part3 = chunk
-            elif i == 3:
-                p.set_canned_message_module_part4 = chunk
+                p.set_canned_message_module_messages = chunk

            logging.debug(f"Setting canned message '{chunk}' part {i+1}")
            self._sendAdmin(p)
@@ -502,6 +466,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"""

@@ -525,6 +497,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}')
--- a/meshtastic/remote_hardware_pb2.py
+++ b/meshtastic/remote_hardware_pb2.py
@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()



-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15remote_hardware.proto\"\xca\x01\n\x0fHardwareMessage\x12\"\n\x03typ\x18\x01 \x01(\x0e\x32\x15.HardwareMessage.Type\x12\x11\n\tgpio_mask\x18\x02 \x01(\x04\x12\x12\n\ngpio_value\x18\x03 \x01(\x04\"l\n\x04Type\x12\t\n\x05UNSET\x10\x00\x12\x0f\n\x0bWRITE_GPIOS\x10\x01\x12\x0f\n\x0bWATCH_GPIOS\x10\x02\x12\x11\n\rGPIOS_CHANGED\x10\x03\x12\x0e\n\nREAD_GPIOS\x10\x04\x12\x14\n\x10READ_GPIOS_REPLY\x10\x05\x42J\n\x13\x63om.geeksville.meshB\x0eRemoteHardwareH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15remote_hardware.proto\"\xcb\x01\n\x0fHardwareMessage\x12#\n\x04type\x18\x01 \x01(\x0e\x32\x15.HardwareMessage.Type\x12\x11\n\tgpio_mask\x18\x02 \x01(\x04\x12\x12\n\ngpio_value\x18\x03 \x01(\x04\"l\n\x04Type\x12\t\n\x05UNSET\x10\x00\x12\x0f\n\x0bWRITE_GPIOS\x10\x01\x12\x0f\n\x0bWATCH_GPIOS\x10\x02\x12\x11\n\rGPIOS_CHANGED\x10\x03\x12\x0e\n\nREAD_GPIOS\x10\x04\x12\x14\n\x10READ_GPIOS_REPLY\x10\x05\x42J\n\x13\x63om.geeksville.meshB\x0eRemoteHardwareH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')



@@ -32,7 +32,7 @@ if _descriptor._USE_C_DESCRIPTORS == False:
  DESCRIPTOR._options = None
  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016RemoteHardwareH\003Z!github.com/meshtastic/gomeshproto'
  _HARDWAREMESSAGE._serialized_start=26
-  _HARDWAREMESSAGE._serialized_end=228
-  _HARDWAREMESSAGE_TYPE._serialized_start=120
-  _HARDWAREMESSAGE_TYPE._serialized_end=228
+  _HARDWAREMESSAGE._serialized_end=229
+  _HARDWAREMESSAGE_TYPE._serialized_start=121
+  _HARDWAREMESSAGE_TYPE._serialized_end=229
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/telemetry_pb2.py
+++ b/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*p\n\x13TelemetrySensorType\x12\x10\n\x0cSENSOR_UNSET\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
+SENSOR_UNSET = 0
+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=529
  _DEVICEMETRICS._serialized_start=19
  _DEVICEMETRICS._serialized_end=124
  _ENVIRONMENTMETRICS._serialized_start=127
--- a/meshtastic/tests/test_smoke1.py
+++ b/meshtastic/tests/test_smoke1.py
@@ -217,24 +217,24 @@ def test_smoke1_set_owner():
@pytest.mark.smoke1
 def test_smoke1_ch_set_modem_config():
    """Test --ch-set modem_config"""
-    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MidFast')
+    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MedFast')
    assert re.search(r'Warning: Need to specify', out, re.MULTILINE)
    assert return_value == 1
    # pause for the radio
    time.sleep(PAUSE_AFTER_COMMAND)
    return_value, out = subprocess.getstatusoutput('meshtastic --info')
-    assert not re.search(r'MidFast', out, re.MULTILINE)
+    assert not re.search(r'MedFast', out, re.MULTILINE)
    assert return_value == 0
    # pause for the radio
    time.sleep(PAUSE_AFTER_COMMAND)
-    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MidFast --ch-index 0')
+    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MedFast --ch-index 0')
    assert re.match(r'Connected to radio', out)
-    assert re.search(r'^Set modem_config to MidFast', out, re.MULTILINE)
+    assert re.search(r'^Set modem_config to MedFast', 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'MidFast', out, re.MULTILINE)
+    assert re.search(r'MedFast', out, re.MULTILINE)
    assert return_value == 0


@@ -247,8 +247,8 @@ def test_smoke1_ch_values():
            '--ch-vlongslow': '{ "psk": "AQ==" }',
            '--ch-longslow': 'LongSlow',
            '--ch-longfast': 'LongFast',
-            '--ch-midslow': 'MidSlow',
-            '--ch-midfast': 'MidFast',
+            '--ch-medslow': 'MedSlow',
+            '--ch-medfast': 'MedFast',
            '--ch-shortslow': 'ShortSlow',
            '--ch-shortfast': 'ShortFast'
          }
--- a/meshtastic/tests/test_smokevirt.py
+++ b/meshtastic/tests/test_smokevirt.py
@@ -227,8 +227,8 @@ def test_smokevirt_ch_values():
    exp = {
            '--ch-longslow': 'LongSlow',
            '--ch-longfast': 'LongFast',
-            '--ch-midslow': 'MidSlow',
-            '--ch-midfast': 'MidFast',
+            '--ch-medslow': 'MedSlow',
+            '--ch-medfast': 'MedFast',
            '--ch-shortslow': 'ShortSlow',
            '--ch-shortfast': 'ShortFast'
          }
--- a/meshtastic/util.py
+++ b/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"}:
--- a/2
+++ b/2
--- a/setup.py
+++ b/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.19",
+    version="1.3alpha.29",
    description="Python API & client shell for talking to Meshtastic devices",
    long_description=long_description,
    long_description_content_type="text/markdown",
Author	SHA1	Message	Date
Ben Meadors	c0006f888b	Add alpha back for upcoming release	2022-09-09 11:05:10 -05:00
Ben Meadors	e2d2d3a347	Refactor	2022-09-09 11:02:58 -05:00
Ben Meadors	3fd50b0e44	Update python to use reworked protos	2022-09-09 09:49:04 -05:00
github-actions	4b0e3ae923	bump version	2022-09-08 21:43:54 +00:00
Ben Meadors	37f10cc0d4	Remove alpha	2022-09-08 15:55:19 -05:00
github-actions	998df265e6	bump version	2022-09-08 12:11:11 +00:00
Ben Meadors	d852981371	Med	2022-09-08 07:09:25 -05:00
Ben Meadors	afed5bd943	Fixed med preset names	2022-09-08 07:09:13 -05:00
Ben Meadors	97b9041b76	Merge pull request #368 from ghostop14/master Fixes #367 MedFast Enum Not Defined	2022-09-08 06:58:18 -05:00
Ben Meadors	2dc14ef466	Merge pull request #369 from rohanki/master Fix for --setalt --setlat --setlon	2022-09-05 20:30:29 -05:00
Rohan King	8e69c32a36	Fix for --setalt --setlat --setlon fix for --setalt --setlat and --setlon	2022-09-06 10:23:19 +10:00
github-actions	42b33bea5b	bump version	2022-09-03 14:03:36 +00:00
Ben Meadors	7fd101cbf8	Update protos and fix error	2022-09-03 09:02:36 -05:00
ghostop14	92ee9889b1	Fixes #367 MedFast Enum Not Defined	2022-09-02 10:44:59 -04:00
github-actions	b6e1610abe	bump version	2022-08-27 13:37:05 +00:00
Ben Meadors	bde5db9c51	Fixed ch-set command in setPref	2022-08-27 08:14:48 -05:00
github-actions	148ae49ded	bump version	2022-08-25 18:25:24 +00:00
Ben Meadors	d1f8365da1	Merge pull request #363 from meshtastic/channel-url Channel setting fixed	2022-08-25 13:24:20 -05:00
Ben Meadors	59fc294d66	Channel setting fixed	2022-08-25 13:22:05 -05:00
github-actions	7473b4e18c	bump version	2022-08-17 02:49:05 +00:00
Ben Meadors	58aafcf3f1	Merge pull request #361 from Douile/dev-change-channel Fix changing modem_preset from CLI shortcuts	2022-08-16 08:58:56 -05:00
Douile	776fc57c35	Fix changing modem_preset from CLI shortcuts Previously the channel shortcuts (e.g. --ch-shortfast) would overrwrite the entire lora config, this meant you lost other configured things such as region. This patch changes that so that just modem_preset is overwritten, and also fixes the call to write config that was missing an argument.	2022-08-16 14:55:17 +01:00
Ben Meadors	b3f752a3c4	Merge pull request #360 from meshtastic/bt-canned Bluetooth and canned messages changes	2022-08-15 21:01:44 -05:00
Ben Meadors	4965ec7f1d	Missed some spots	2022-08-15 20:54:11 -05:00
Ben Meadors	0746acd34f	Canned messages and bluetooth sections	2022-08-15 19:01:37 -05:00
github-actions	49b1c4816e	bump version	2022-08-11 17:46:19 +00:00
Ben Meadors	7c6e87e161	Merge pull request #356 from meshtastic/increase-timeouts Only write single config	2022-08-11 12:45:12 -05:00
Ben Meadors	b548700c0b	Only write single config	2022-08-11 12:43:41 -05:00
github-actions	f278a30003	bump version	2022-08-11 16:53:26 +00:00
Ben Meadors	22bbe67d24	Merge pull request #355 from meshtastic/increase-timeouts Increase delay for reliability	2022-08-11 11:51:09 -05:00
Ben Meadors	a2861a133e	Increase delay for reliability	2022-08-11 11:48:57 -05:00
github-actions	03aab10786	bump version	2022-08-09 11:29:44 +00:00
Ben Meadors	95e768efd5	Merge pull request #354 from meshtastic/device-metadata Add get device metadata admin message	2022-08-08 07:07:47 -05:00
Ben Meadors	6644e86be9	Add get device metadata admin message	2022-08-08 07:04:29 -05:00
Ben Meadors	c8363cd476	Merge pull request #352 from Douile/dev-export-valid-yaml Replace the primative print based config generator with proper yaml serialization	2022-08-05 10:14:42 -05:00
Ben Meadors	62efe1ab7f	Merge pull request #353 from Douile/dev-fix-lint-errors-2 Fix lint errors	2022-08-05 10:13:58 -05:00
Douile	01e643ad2f	Fix lint errors	2022-08-05 13:48:07 +01:00
Douile	e4078e84d7	Fix linting errors caused by this PR	2022-08-05 13:34:25 +01:00
Ben Meadors	abfcbe2a90	Merge pull request #350 from Douile/dev-base64-decode Allow setting values from base64 values	2022-07-28 17:42:08 -05:00
Douile	e06d8bbc06	Use pyyaml to generate valid configuration output The custom yaml generator made an invalid yaml file that needed to be fixed, by using the already included pyyaml library we can make sure the output is valid.	2022-07-28 15:11:35 +01:00
Ben Meadors	a78cdde86f	Merge pull request #349 from Douile/dev-fix-errors Fix crash when trying to set value that doesn't exist	2022-07-27 18:53:44 -05:00
Douile	10517ac94d	Allow setting values from base64 values By prefixing a value with "base64:" e.g. ("base64:AQ==") it will now be decoded to raw bytes. This is useful when setting psk as that is often shown as base64.	2022-07-27 15:12:23 +01:00
Douile	a572699588	Fix crash when trying to set value that doesn't exist	2022-07-27 15:09:58 +01:00
github-actions	d11fb47734	bump version	2022-07-02 19:52:35 +00:00