Correct config

Merge master
Regen protos
2025-12-26 09:27:52 -05:00 · 2022-06-16 20:31:14 -05:00 · 2022-06-16 16:57:31 -05:00 · 2022-06-16 16:57:05 -05:00 · 2022-06-15 11:46:31 -05:00 · 2022-06-15 10:58:55 -05:00
33 changed files with 2888 additions and 1779 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Linting and Tests
+name: CI
 on:
  push:
    branches:
@@ -42,14 +42,14 @@ jobs:
        run: |
          pytest --cov=meshtastic --cov-report=xml
      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage.xml
+          files: ./coverage.xml
          flags: unittests
          name: codecov-umbrella
-          yml: ./codecov.yml
          fail_ci_if_error: true
+          verbose: true
  validate:
    runs-on: ubuntu-latest
    strategy:
--- a/.pylintrc
+++ b/.pylintrc
@@ -7,7 +7,7 @@

 # Add files or directories matching the regex patterns to the blacklist. The
 # regex matches against base names, not paths.
-ignore-patterns=mqtt_pb2.py,channel_pb2.py,telemetry_pb2.py,admin_pb2.py,radioconfig_pb2.py,deviceonly_pb2.py,apponly_pb2.py,remote_hardware_pb2.py,portnums_pb2.py,mesh_pb2.py,storeforward_pb2.py,cannedmessages_pb2.py
+ignore-patterns=mqtt_pb2.py,channel_pb2.py,telemetry_pb2.py,admin_pb2.py,config_pb2.py,deviceonly_pb2.py,apponly_pb2.py,remote_hardware_pb2.py,portnums_pb2.py,mesh_pb2.py,storeforward_pb2.py,cannedmessages_pb2.py



--- a/4
+++ b/4
@@ -6,6 +6,10 @@ test:
 virt:
 	pytest -m smokevirt

+# run the smoke1 test (after doing a factory reset and unplugging/replugging in device)
+smoke1:
+	pytest -m smoke1 -s -vv
+
 # local install
 install:
 	pip install .
--- a/README.md
+++ b/README.md
@@ -1,15 +1,25 @@
-# Meshtastic-python
+# Meshtastic Python

-[![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/meshtastic/Meshtastic-python)
-![Unit Tests](https://github.com/meshtastic/Meshtastic-python/actions/workflows/ci.yml/badge.svg)
 [![codecov](https://codecov.io/gh/meshtastic/Meshtastic-python/branch/master/graph/badge.svg?token=TIWPJL73KV)](https://codecov.io/gh/meshtastic/Meshtastic-python)
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/meshtastic)
+[![CI](https://img.shields.io/github/workflow/status/meshtastic/Meshtastic-python/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/Meshtastic-python/actions/workflows/ci.yml)
+[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/Meshtastic-python)](https://cla-assistant.io/meshtastic/Meshtastic-python)
+[![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg?label=Fiscal%20Contributors&color=deeppink)](https://opencollective.com/meshtastic/)
+[![Vercel](https://img.shields.io/static/v1?label=Powered%20by&message=Vercel&style=flat&logo=vercel&color=000000)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)

-A python client for using [Meshtastic](https://www.meshtastic.org) devices. This small library (and example application) provides an easy API for sending and receiving messages over mesh radios. It also provides access to any of the operations/data available in the device user interface or the Android application. Events are delivered using a publish-subscribe model, and you can subscribe to only the message types you are interested in.
+## Overview

-Full documentation including examples [here](https://meshtastic.org/docs/software/python/python-installation).
-
-The library api is documented [here](https://meshtastic-python.vercel.app/meshtastic/index.html)
+A Python client for use with Meshtastic devices.
+This small library (and example application) provides an easy API for sending and receiving messages over mesh radios.
+It also provides access to any of the operations/data available in the device user interface or the Android application.
+Events are delivered using a publish-subscribe model, and you can subscribe to only the message types you are interested in.


-[![Powered by Vercel](https://raw.githubusercontent.com/abumalick/powered-by-vercel/master/powered-by-vercel.svg)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)
+**[Getting Started Guide](https://meshtastic.org/docs/software/python/python-installation)**
+
+**[Documentation/API Reference](https://python.meshtastic.org/)**
+
+
+## Stats
+
+![Alt](https://repobeats.axiom.co/api/embed/3d64492daee3a603497071b45e6cdb81d9b2d421.svg "Repobeats analytics image")
--- a/exampleConfig.yaml
+++ b/exampleConfig.yaml
@@ -12,6 +12,5 @@ location:
 userPrefs:
  region: 1
  isAlwaysPowered: 'true'
-  sendOwnerInterval: 2
  screenOnSecs: 31536000
  waitBluetoothSecs: 31536000
--- a/example_config.yaml
+++ b/example_config.yaml
@@ -12,7 +12,6 @@ location:
 user_prefs:
  region: 1
  is_always_powered: 'true'
-  send_owner_interval: 2
  screen_on_secs: 31536000
  wait_bluetooth_secs: 31536000
  location_share: 'LocEnabled'
--- a/info/mac/nano_g1.txt
+++ b/info/mac/nano_g1.txt
@@ -0,0 +1,30 @@
+meshtastic detected port: /dev/cu.wchusbserial53820208781
+
+ioreg -p IOUSB
+
+shows this:
+
+| +-o USB Single Serial@14300000  <class AppleUSBDevice, id 0x1000407a5, registered, matched, active, busy 0 (18 ms), retain 14>
+
+
+
+
+system_profiler SPUSBDataType > /tmp/a
+	with device plugged in
+
+system_profiler SPUSBDataType > /tmp/b
+	with device not plugged in
+
+diff /tmp/a /tmp/b
+
+<         USB Single Serial:
+<
+<           Product ID: 0x55d4
+<           Vendor ID: 0x1a86
+<           Version: 4.43
+<           Serial Number: 5382020878
+<           Speed: Up to 12 Mb/s
+<           Location ID: 0x14300000 / 63
+<           Current Available (mA): 500
+<           Current Required (mA): 134
+<           Extra Operating Current (mA): 0
--- a/info/ubuntu/nano_g1.txt
+++ b/info/ubuntu/nano_g1.txt
@@ -0,0 +1,91 @@
+lsusb -d 1a86: -v
+
+Bus 001 Device 013: ID 1a86:55d4 QinHeng Electronics
+Couldn't open device, some information will be missing
+Device Descriptor:
+  bLength                18
+  bDescriptorType         1
+  bcdUSB               1.10
+  bDeviceClass            2 Communications
+  bDeviceSubClass         0
+  bDeviceProtocol         0
+  bMaxPacketSize0         8
+  idVendor           0x1a86 QinHeng Electronics
+  idProduct          0x55d4
+  bcdDevice            4.43
+  iManufacturer           0
+  iProduct                2
+  iSerial                 3
+  bNumConfigurations      1
+  Configuration Descriptor:
+    bLength                 9
+    bDescriptorType         2
+    wTotalLength       0x0043
+    bNumInterfaces          2
+    bConfigurationValue     1
+    iConfiguration          0
+    bmAttributes         0xa0
+      (Bus Powered)
+      Remote Wakeup
+    MaxPower              134mA
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        0
+      bAlternateSetting       0
+      bNumEndpoints           1
+      bInterfaceClass         2 Communications
+      bInterfaceSubClass      2 Abstract (modem)
+      bInterfaceProtocol      1 AT-commands (v.25ter)
+      iInterface              0
+      CDC Header:
+        bcdCDC               1.10
+      CDC Call Management:
+        bmCapabilities       0x00
+        bDataInterface          1
+      CDC ACM:
+        bmCapabilities       0x02
+          line coding and serial state
+      CDC Union:
+        bMasterInterface        0
+        bSlaveInterface         1
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x83  EP 3 IN
+        bmAttributes            3
+          Transfer Type            Interrupt
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0010  1x 16 bytes
+        bInterval               1
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        1
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass        10 CDC Data
+      bInterfaceSubClass      0
+      bInterfaceProtocol      0
+      iInterface              0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x02  EP 2 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0020  1x 32 bytes
+        bInterval               0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x82  EP 2 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0040  1x 64 bytes
+        bInterval               0
--- a/info/windows/nano_g1.txt
+++ b/info/windows/nano_g1.txt
@@ -0,0 +1,39 @@
+Get-PnpDevice -PresentOnly | Format-List >a
+Get-PnpDevice -PresentOnly | Format-List >b
+Compare-Object (get-content a) (Get-Content b)
+
+InputObject                                                                                              SideIndicator
+-----------                                                                                              -------------
+Caption                     : USB-Enhanced-SERIAL CH9102 (COM9)                                          =>
+Description                 : USB-Enhanced-SERIAL CH9102                                                 =>
+Name                        : USB-Enhanced-SERIAL CH9102 (COM9)                                          =>
+DeviceID                    : USB\VID_1A86&PID_55D4\5382020745                                           =>
+PNPDeviceID                 : USB\VID_1A86&PID_55D4\5382020745                                           =>
+ClassGuid                   : {4d36e978-e325-11ce-bfc1-08002be10318}                                     =>
+CompatibleID                : {USB\Class_02&SubClass_02&Prot_01, USB\Class_02&SubClass_02, USB\Class_02} =>
+HardwareID                  : {USB\VID_1A86&PID_55D4&REV_0443, USB\VID_1A86&PID_55D4}                    =>
+Manufacturer                : wch.cn                                                                     =>
+PNPClass                    : Ports                                                                      =>
+Service                     : CH343SER_A64                                                               =>
+Class                       : Ports                                                                      =>
+FriendlyName                : USB-Enhanced-SERIAL CH9102 (COM9)                                          =>
+InstanceId                  : USB\VID_1A86&PID_55D4\5382020745                                           =>
+InstallDate                 :                                                                            =>
+Status                      : OK                                                                         =>
+Availability                :                                                                            =>
+ConfigManagerErrorCode      : CM_PROB_NONE                                                               =>
+ConfigManagerUserConfig     : False                                                                      =>
+CreationClassName           : Win32_PnPEntity                                                            =>
+ErrorCleared                :                                                                            =>
+ErrorDescription            :                                                                            =>
+LastErrorCode               :                                                                            =>
+PowerManagementCapabilities :                                                                            =>
+PowerManagementSupported    :                                                                            =>
+StatusInfo                  :                                                                            =>
+SystemCreationClassName     : Win32_ComputerSystem                                                       =>
+SystemName                  : DESKTOP-FRFQN8H                                                            =>
+Present                     : True                                                                       =>
+PSComputerName              :                                                                            =>
+Problem                     : CM_PROB_NONE                                                               =>
+ProblemDescription          :                                                                            =>
+                                                                                                         =>
--- a/meshtastic/init.py
+++ b/meshtastic/init.py
@@ -80,7 +80,7 @@ from meshtastic.util import fixme, catchAndIgnore, stripnl, DeferredExecution, T
 from meshtastic.node import Node
 from meshtastic import (mesh_pb2, portnums_pb2, apponly_pb2, admin_pb2,
                        telemetry_pb2, remote_hardware_pb2,
-                        channel_pb2, radioconfig_pb2, util)
+                        channel_pb2, config_pb2, util)


 # Note: To follow PEP224, comments should be after the module variable.
@@ -94,7 +94,7 @@ BROADCAST_NUM = 0xffffffff
 BROADCAST_ADDR = "^all"
 """A special ID that means broadcast"""

-OUR_APP_VERSION = 20200
+OUR_APP_VERSION = 20300
 """The numeric buildnumber (shared with android apps) specifying the
   level of device code we are guaranteed to understand

--- a/meshtastic/main.py
+++ b/meshtastic/main.py
@@ -16,7 +16,7 @@ import meshtastic.util
 import meshtastic.test
 from meshtastic import remote_hardware
 from meshtastic.ble_interface import BLEInterface
-from meshtastic import portnums_pb2, channel_pb2, radioconfig_pb2
+from meshtastic import portnums_pb2, channel_pb2, config_pb2
 from meshtastic.globals import Globals
 from meshtastic.__init__ import BROADCAST_ADDR

@@ -229,12 +229,12 @@ def onConnected(interface):

            try:
                for field in args.pos_fields:
-                    v_field = radioconfig_pb2.PositionFlags.Value(field)
+                    v_field = config_pb2.PositionFlags.Value(field)
                    allFields |= v_field

            except ValueError:
                print("ERROR: supported position fields are:")
-                print(radioconfig_pb2.PositionFlags.keys())
+                print(config_pb2.PositionFlags.keys())
                print("If no fields are specified, will read and display current value.")

            else:
@@ -249,9 +249,9 @@ def onConnected(interface):
            prefs = interface.getNode(args.dest).radioConfig.preferences

            fieldNames = []
-            for bit in radioconfig_pb2.PositionFlags.values():
+            for bit in config_pb2.PositionFlags.values():
                if prefs.position_flags & bit:
-                    fieldNames.append(radioconfig_pb2.PositionFlags.Name(bit))
+                    fieldNames.append(config_pb2.PositionFlags.Name(bit))
            print(' '.join(fieldNames))

        if args.set_team:
--- a/meshtastic/admin_pb2.py
+++ b/meshtastic/admin_pb2.py
@@ -12,8 +12,9 @@ _sym_db = _symbol_database.Default()


 from . import channel_pb2 as channel__pb2
+from . import config_pb2 as config__pb2
 from . import mesh_pb2 as mesh__pb2
-from . import radioconfig_pb2 as radioconfig__pb2
+from . import module_config_pb2 as module__config__pb2


 DESCRIPTOR = _descriptor.FileDescriptor(
@@ -21,12 +22,92 @@ DESCRIPTOR = _descriptor.FileDescriptor(
  package='',
  syntax='proto3',
  serialized_options=b'\n\023com.geeksville.meshB\013AdminProtosH\003Z!github.com/meshtastic/gomeshproto',
-  serialized_pb=b'\n\x0b\x61\x64min.proto\x1a\rchannel.proto\x1a\nmesh.proto\x1a\x11radioconfig.proto\"\xa1\x08\n\x0c\x41\x64minMessage\x12!\n\tset_radio\x18\x01 \x01(\x0b\x32\x0c.RadioConfigH\x00\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\x1b\n\x11get_radio_request\x18\x04 \x01(\x08H\x00\x12*\n\x12get_radio_response\x18\x05 \x01(\x0b\x32\x0c.RadioConfigH\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\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\x42\t\n\x07variantBG\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+  serialized_pb=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'
  ,
-  dependencies=[channel__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,radioconfig__pb2.DESCRIPTOR,])
+  dependencies=[channel__pb2.DESCRIPTOR,config__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,module__config__pb2.DESCRIPTOR,])



+_ADMINMESSAGE_CONFIGTYPE = _descriptor.EnumDescriptor(
+  name='ConfigType',
+  full_name='AdminMessage.ConfigType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='DEVICE_CONFIG', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POSITION_CONFIG', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POWER_CONFIG', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='WIFI_CONFIG', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DISPLAY_CONFIG', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LORA_CONFIG', index=5, number=5,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=1378,
+  serialized_end=1502,
+)
+_sym_db.RegisterEnumDescriptor(_ADMINMESSAGE_CONFIGTYPE)
+
+_ADMINMESSAGE_MODULECONFIGTYPE = _descriptor.EnumDescriptor(
+  name='ModuleConfigType',
+  full_name='AdminMessage.ModuleConfigType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='MQTT_CONFIG', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SERIAL_CONFIG', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='EXTNOTIF_CONFIG', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='STOREFORWARD_CONFIG', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RANGETEST_CONFIG', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TELEMETRY_CONFIG', index=5, number=5,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CANNEDMSG_CONFIG', index=6, number=6,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=1505,
+  serialized_end=1671,
+)
+_sym_db.RegisterEnumDescriptor(_ADMINMESSAGE_MODULECONFIGTYPE)
+

 _ADMINMESSAGE = _descriptor.Descriptor(
  name='AdminMessage',
@@ -36,182 +117,217 @@ _ADMINMESSAGE = _descriptor.Descriptor(
  containing_type=None,
  fields=[
    _descriptor.FieldDescriptor(
-      name='set_radio', full_name='AdminMessage.set_radio', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='set_owner', full_name='AdminMessage.set_owner', index=1,
+      name='set_owner', full_name='AdminMessage.set_owner', index=0,
      number=2, type=11, cpp_type=10, label=1,
      has_default_value=False, default_value=None,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='set_channel', full_name='AdminMessage.set_channel', index=2,
+      name='set_channel', full_name='AdminMessage.set_channel', index=1,
      number=3, type=11, cpp_type=10, label=1,
      has_default_value=False, default_value=None,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_radio_request', full_name='AdminMessage.get_radio_request', index=3,
-      number=4, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='get_radio_response', full_name='AdminMessage.get_radio_response', index=4,
-      number=5, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='get_channel_request', full_name='AdminMessage.get_channel_request', index=5,
+      name='get_channel_request', full_name='AdminMessage.get_channel_request', index=2,
      number=6, type=13, cpp_type=3, label=1,
      has_default_value=False, default_value=0,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_channel_response', full_name='AdminMessage.get_channel_response', index=6,
+      name='get_channel_response', full_name='AdminMessage.get_channel_response', index=3,
      number=7, type=11, cpp_type=10, label=1,
      has_default_value=False, default_value=None,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_owner_request', full_name='AdminMessage.get_owner_request', index=7,
+      name='get_owner_request', full_name='AdminMessage.get_owner_request', index=4,
      number=8, type=8, cpp_type=7, label=1,
      has_default_value=False, default_value=False,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_owner_response', full_name='AdminMessage.get_owner_response', index=8,
+      name='get_owner_response', full_name='AdminMessage.get_owner_response', index=5,
      number=9, type=11, cpp_type=10, label=1,
      has_default_value=False, default_value=None,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='confirm_set_channel', full_name='AdminMessage.confirm_set_channel', index=9,
+      name='get_config_request', full_name='AdminMessage.get_config_request', index=6,
+      number=10, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_config_response', full_name='AdminMessage.get_config_response', index=7,
+      number=11, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='set_config', full_name='AdminMessage.set_config', index=8,
+      number=12, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='confirm_set_config', full_name='AdminMessage.confirm_set_config', index=9,
+      number=13, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_module_config_request', full_name='AdminMessage.get_module_config_request', index=10,
+      number=14, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_module_config_response', full_name='AdminMessage.get_module_config_response', index=11,
+      number=15, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='set_module_config', full_name='AdminMessage.set_module_config', index=12,
+      number=16, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='confirm_set_module_config', full_name='AdminMessage.confirm_set_module_config', index=13,
+      number=17, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='confirm_set_channel', full_name='AdminMessage.confirm_set_channel', index=14,
      number=32, type=8, cpp_type=7, label=1,
      has_default_value=False, default_value=False,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='confirm_set_radio', full_name='AdminMessage.confirm_set_radio', index=10,
+      name='confirm_set_radio', full_name='AdminMessage.confirm_set_radio', index=15,
      number=33, type=8, cpp_type=7, label=1,
      has_default_value=False, default_value=False,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='exit_simulator', full_name='AdminMessage.exit_simulator', index=11,
+      name='exit_simulator', full_name='AdminMessage.exit_simulator', index=16,
      number=34, type=8, cpp_type=7, label=1,
      has_default_value=False, default_value=False,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='reboot_seconds', full_name='AdminMessage.reboot_seconds', index=12,
+      name='reboot_seconds', full_name='AdminMessage.reboot_seconds', index=17,
      number=35, type=5, cpp_type=1, label=1,
      has_default_value=False, default_value=0,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_canned_message_module_part1_request', full_name='AdminMessage.get_canned_message_module_part1_request', index=13,
+      name='get_canned_message_module_part1_request', full_name='AdminMessage.get_canned_message_module_part1_request', index=18,
      number=36, type=8, cpp_type=7, label=1,
      has_default_value=False, default_value=False,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_canned_message_module_part1_response', full_name='AdminMessage.get_canned_message_module_part1_response', index=14,
+      name='get_canned_message_module_part1_response', full_name='AdminMessage.get_canned_message_module_part1_response', index=19,
      number=37, type=9, cpp_type=9, label=1,
      has_default_value=False, default_value=b"".decode('utf-8'),
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_canned_message_module_part2_request', full_name='AdminMessage.get_canned_message_module_part2_request', index=15,
+      name='get_canned_message_module_part2_request', full_name='AdminMessage.get_canned_message_module_part2_request', index=20,
      number=38, type=8, cpp_type=7, label=1,
      has_default_value=False, default_value=False,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_canned_message_module_part2_response', full_name='AdminMessage.get_canned_message_module_part2_response', index=16,
+      name='get_canned_message_module_part2_response', full_name='AdminMessage.get_canned_message_module_part2_response', index=21,
      number=39, type=9, cpp_type=9, label=1,
      has_default_value=False, default_value=b"".decode('utf-8'),
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_canned_message_module_part3_request', full_name='AdminMessage.get_canned_message_module_part3_request', index=17,
+      name='get_canned_message_module_part3_request', full_name='AdminMessage.get_canned_message_module_part3_request', index=22,
      number=40, type=8, cpp_type=7, label=1,
      has_default_value=False, default_value=False,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_canned_message_module_part3_response', full_name='AdminMessage.get_canned_message_module_part3_response', index=18,
+      name='get_canned_message_module_part3_response', full_name='AdminMessage.get_canned_message_module_part3_response', index=23,
      number=41, type=9, cpp_type=9, label=1,
      has_default_value=False, default_value=b"".decode('utf-8'),
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_canned_message_module_part4_request', full_name='AdminMessage.get_canned_message_module_part4_request', index=19,
+      name='get_canned_message_module_part4_request', full_name='AdminMessage.get_canned_message_module_part4_request', index=24,
      number=42, type=8, cpp_type=7, label=1,
      has_default_value=False, default_value=False,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='get_canned_message_module_part4_response', full_name='AdminMessage.get_canned_message_module_part4_response', index=20,
+      name='get_canned_message_module_part4_response', full_name='AdminMessage.get_canned_message_module_part4_response', index=25,
      number=43, type=9, cpp_type=9, label=1,
      has_default_value=False, default_value=b"".decode('utf-8'),
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='set_canned_message_module_part1', full_name='AdminMessage.set_canned_message_module_part1', index=21,
+      name='set_canned_message_module_part1', full_name='AdminMessage.set_canned_message_module_part1', index=26,
      number=44, type=9, cpp_type=9, label=1,
      has_default_value=False, default_value=b"".decode('utf-8'),
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='set_canned_message_module_part2', full_name='AdminMessage.set_canned_message_module_part2', index=22,
+      name='set_canned_message_module_part2', full_name='AdminMessage.set_canned_message_module_part2', index=27,
      number=45, type=9, cpp_type=9, label=1,
      has_default_value=False, default_value=b"".decode('utf-8'),
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='set_canned_message_module_part3', full_name='AdminMessage.set_canned_message_module_part3', index=23,
+      name='set_canned_message_module_part3', full_name='AdminMessage.set_canned_message_module_part3', index=28,
      number=46, type=9, cpp_type=9, label=1,
      has_default_value=False, default_value=b"".decode('utf-8'),
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='set_canned_message_module_part4', full_name='AdminMessage.set_canned_message_module_part4', index=24,
+      name='set_canned_message_module_part4', full_name='AdminMessage.set_canned_message_module_part4', index=29,
      number=47, type=9, cpp_type=9, label=1,
      has_default_value=False, default_value=b"".decode('utf-8'),
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='shutdown_seconds', full_name='AdminMessage.shutdown_seconds', index=25,
+      name='shutdown_seconds', full_name='AdminMessage.shutdown_seconds', index=30,
      number=51, type=5, cpp_type=1, label=1,
      has_default_value=False, default_value=0,
      message_type=None, enum_type=None, containing_type=None,
@@ -222,6 +338,8 @@ _ADMINMESSAGE = _descriptor.Descriptor(
  ],
  nested_types=[],
  enum_types=[
+    _ADMINMESSAGE_CONFIGTYPE,
+    _ADMINMESSAGE_MODULECONFIGTYPE,
  ],
  serialized_options=None,
  is_extendable=False,
@@ -232,31 +350,28 @@ _ADMINMESSAGE = _descriptor.Descriptor(
      name='variant', full_name='AdminMessage.variant',
      index=0, containing_type=None, fields=[]),
  ],
-  serialized_start=62,
-  serialized_end=1119,
+  serialized_start=78,
+  serialized_end=1682,
 )

-_ADMINMESSAGE.fields_by_name['set_radio'].message_type = radioconfig__pb2._RADIOCONFIG
 _ADMINMESSAGE.fields_by_name['set_owner'].message_type = mesh__pb2._USER
 _ADMINMESSAGE.fields_by_name['set_channel'].message_type = channel__pb2._CHANNEL
-_ADMINMESSAGE.fields_by_name['get_radio_response'].message_type = radioconfig__pb2._RADIOCONFIG
 _ADMINMESSAGE.fields_by_name['get_channel_response'].message_type = channel__pb2._CHANNEL
 _ADMINMESSAGE.fields_by_name['get_owner_response'].message_type = mesh__pb2._USER
-_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['set_radio'])
-_ADMINMESSAGE.fields_by_name['set_radio'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.fields_by_name['get_config_request'].enum_type = _ADMINMESSAGE_CONFIGTYPE
+_ADMINMESSAGE.fields_by_name['get_config_response'].message_type = config__pb2._CONFIG
+_ADMINMESSAGE.fields_by_name['set_config'].message_type = config__pb2._CONFIG
+_ADMINMESSAGE.fields_by_name['get_module_config_request'].enum_type = _ADMINMESSAGE_MODULECONFIGTYPE
+_ADMINMESSAGE.fields_by_name['get_module_config_response'].message_type = module__config__pb2._MODULECONFIG
+_ADMINMESSAGE.fields_by_name['set_module_config'].message_type = module__config__pb2._MODULECONFIG
+_ADMINMESSAGE_CONFIGTYPE.containing_type = _ADMINMESSAGE
+_ADMINMESSAGE_MODULECONFIGTYPE.containing_type = _ADMINMESSAGE
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
  _ADMINMESSAGE.fields_by_name['set_owner'])
 _ADMINMESSAGE.fields_by_name['set_owner'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
  _ADMINMESSAGE.fields_by_name['set_channel'])
 _ADMINMESSAGE.fields_by_name['set_channel'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
-_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['get_radio_request'])
-_ADMINMESSAGE.fields_by_name['get_radio_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
-_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['get_radio_response'])
-_ADMINMESSAGE.fields_by_name['get_radio_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
  _ADMINMESSAGE.fields_by_name['get_channel_request'])
 _ADMINMESSAGE.fields_by_name['get_channel_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
@@ -269,6 +384,30 @@ _ADMINMESSAGE.fields_by_name['get_owner_request'].containing_oneof = _ADMINMESSA
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
  _ADMINMESSAGE.fields_by_name['get_owner_response'])
 _ADMINMESSAGE.fields_by_name['get_owner_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_config_request'])
+_ADMINMESSAGE.fields_by_name['get_config_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_config_response'])
+_ADMINMESSAGE.fields_by_name['get_config_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['set_config'])
+_ADMINMESSAGE.fields_by_name['set_config'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['confirm_set_config'])
+_ADMINMESSAGE.fields_by_name['confirm_set_config'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_module_config_request'])
+_ADMINMESSAGE.fields_by_name['get_module_config_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_module_config_response'])
+_ADMINMESSAGE.fields_by_name['get_module_config_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['set_module_config'])
+_ADMINMESSAGE.fields_by_name['set_module_config'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['confirm_set_module_config'])
+_ADMINMESSAGE.fields_by_name['confirm_set_module_config'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
  _ADMINMESSAGE.fields_by_name['confirm_set_channel'])
 _ADMINMESSAGE.fields_by_name['confirm_set_channel'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
--- a/meshtastic/apponly_pb2.py
+++ b/meshtastic/apponly_pb2.py
@@ -12,6 +12,7 @@ _sym_db = _symbol_database.Default()


 from . import channel_pb2 as channel__pb2
+from . import config_pb2 as config__pb2


 DESCRIPTOR = _descriptor.FileDescriptor(
@@ -19,9 +20,9 @@ DESCRIPTOR = _descriptor.FileDescriptor(
  package='',
  syntax='proto3',
  serialized_options=b'\n\023com.geeksville.meshB\rAppOnlyProtosH\003Z!github.com/meshtastic/gomeshproto',
-  serialized_pb=b'\n\rapponly.proto\x1a\rchannel.proto\"0\n\nChannelSet\x12\"\n\x08settings\x18\x01 \x03(\x0b\x32\x10.ChannelSettingsBI\n\x13\x63om.geeksville.meshB\rAppOnlyProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+  serialized_pb=b'\n\rapponly.proto\x1a\rchannel.proto\x1a\x0c\x63onfig.proto\"Y\n\nChannelSet\x12\"\n\x08settings\x18\x01 \x03(\x0b\x32\x10.ChannelSettings\x12\'\n\x0blora_config\x18\x02 \x01(\x0b\x32\x12.Config.LoRaConfigBI\n\x13\x63om.geeksville.meshB\rAppOnlyProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
  ,
-  dependencies=[channel__pb2.DESCRIPTOR,])
+  dependencies=[channel__pb2.DESCRIPTOR,config__pb2.DESCRIPTOR,])



@@ -40,6 +41,13 @@ _CHANNELSET = _descriptor.Descriptor(
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='lora_config', full_name='ChannelSet.lora_config', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
  ],
  extensions=[
  ],
@@ -52,11 +60,12 @@ _CHANNELSET = _descriptor.Descriptor(
  extension_ranges=[],
  oneofs=[
  ],
-  serialized_start=32,
-  serialized_end=80,
+  serialized_start=46,
+  serialized_end=135,
 )

 _CHANNELSET.fields_by_name['settings'].message_type = channel__pb2._CHANNELSETTINGS
+_CHANNELSET.fields_by_name['lora_config'].message_type = config__pb2._CONFIG_LORACONFIG
 DESCRIPTOR.message_types_by_name['ChannelSet'] = _CHANNELSET
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)

--- a/meshtastic/channel_pb2.py
+++ b/meshtastic/channel_pb2.py
@@ -18,53 +18,11 @@ DESCRIPTOR = _descriptor.FileDescriptor(
  package='',
  syntax='proto3',
  serialized_options=b'\n\023com.geeksville.meshB\rChannelProtosH\003Z!github.com/meshtastic/gomeshproto',
-  serialized_pb=b'\n\rchannel.proto\"\xf6\x02\n\x0f\x43hannelSettings\x12\x10\n\x08tx_power\x18\x01 \x01(\x05\x12\x32\n\x0cmodem_config\x18\x03 \x01(\x0e\x32\x1c.ChannelSettings.ModemConfig\x12\x11\n\tbandwidth\x18\x06 \x01(\r\x12\x15\n\rspread_factor\x18\x07 \x01(\r\x12\x13\n\x0b\x63oding_rate\x18\x08 \x01(\r\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\"p\n\x0bModemConfig\x12\r\n\tVLongSlow\x10\x00\x12\x0c\n\x08LongSlow\x10\x01\x12\x0c\n\x08LongFast\x10\x02\x12\x0b\n\x07MidSlow\x10\x03\x12\x0b\n\x07MidFast\x10\x04\x12\r\n\tShortSlow\x10\x05\x12\r\n\tShortFast\x10\x06\"\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'
+  serialized_pb=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'
 )



-_CHANNELSETTINGS_MODEMCONFIG = _descriptor.EnumDescriptor(
-  name='ModemConfig',
-  full_name='ChannelSettings.ModemConfig',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='VLongSlow', index=0, number=0,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='LongSlow', index=1, number=1,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='LongFast', index=2, number=2,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='MidSlow', index=3, number=3,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='MidFast', index=4, number=4,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='ShortSlow', index=5, number=5,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='ShortFast', index=6, number=6,
-      serialized_options=None,
-      type=None),
-  ],
-  containing_type=None,
-  serialized_options=None,
-  serialized_start=280,
-  serialized_end=392,
-)
-_sym_db.RegisterEnumDescriptor(_CHANNELSETTINGS_MODEMCONFIG)
-
 _CHANNEL_ROLE = _descriptor.EnumDescriptor(
  name='Role',
  full_name='Channel.Role',
@@ -86,8 +44,8 @@ _CHANNEL_ROLE = _descriptor.EnumDescriptor(
  ],
  containing_type=None,
  serialized_options=None,
-  serialized_start=486,
-  serialized_end=534,
+  serialized_start=238,
+  serialized_end=286,
 )
 _sym_db.RegisterEnumDescriptor(_CHANNEL_ROLE)

@@ -100,77 +58,42 @@ _CHANNELSETTINGS = _descriptor.Descriptor(
  containing_type=None,
  fields=[
    _descriptor.FieldDescriptor(
-      name='tx_power', full_name='ChannelSettings.tx_power', index=0,
-      number=1, type=5, cpp_type=1, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='modem_config', full_name='ChannelSettings.modem_config', index=1,
-      number=3, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='bandwidth', full_name='ChannelSettings.bandwidth', index=2,
-      number=6, type=13, cpp_type=3, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='spread_factor', full_name='ChannelSettings.spread_factor', index=3,
-      number=7, type=13, cpp_type=3, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='coding_rate', full_name='ChannelSettings.coding_rate', index=4,
-      number=8, type=13, cpp_type=3, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='channel_num', full_name='ChannelSettings.channel_num', index=5,
+      name='channel_num', full_name='ChannelSettings.channel_num', index=0,
      number=9, type=13, cpp_type=3, label=1,
      has_default_value=False, default_value=0,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='psk', full_name='ChannelSettings.psk', index=6,
+      name='psk', full_name='ChannelSettings.psk', index=1,
      number=4, type=12, cpp_type=9, label=1,
      has_default_value=False, default_value=b"",
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='name', full_name='ChannelSettings.name', index=7,
+      name='name', full_name='ChannelSettings.name', index=2,
      number=5, type=9, cpp_type=9, label=1,
      has_default_value=False, default_value=b"".decode('utf-8'),
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='id', full_name='ChannelSettings.id', index=8,
+      name='id', full_name='ChannelSettings.id', index=3,
      number=10, type=7, cpp_type=3, label=1,
      has_default_value=False, default_value=0,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='uplink_enabled', full_name='ChannelSettings.uplink_enabled', index=9,
+      name='uplink_enabled', full_name='ChannelSettings.uplink_enabled', index=4,
      number=16, type=8, cpp_type=7, label=1,
      has_default_value=False, default_value=False,
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
    _descriptor.FieldDescriptor(
-      name='downlink_enabled', full_name='ChannelSettings.downlink_enabled', index=10,
+      name='downlink_enabled', full_name='ChannelSettings.downlink_enabled', index=5,
      number=17, type=8, cpp_type=7, label=1,
      has_default_value=False, default_value=False,
      message_type=None, enum_type=None, containing_type=None,
@@ -181,7 +104,6 @@ _CHANNELSETTINGS = _descriptor.Descriptor(
  ],
  nested_types=[],
  enum_types=[
-    _CHANNELSETTINGS_MODEMCONFIG,
  ],
  serialized_options=None,
  is_extendable=False,
@@ -189,8 +111,8 @@ _CHANNELSETTINGS = _descriptor.Descriptor(
  extension_ranges=[],
  oneofs=[
  ],
-  serialized_start=18,
-  serialized_end=392,
+  serialized_start=17,
+  serialized_end=144,
 )


@@ -235,12 +157,10 @@ _CHANNEL = _descriptor.Descriptor(
  extension_ranges=[],
  oneofs=[
  ],
-  serialized_start=395,
-  serialized_end=534,
+  serialized_start=147,
+  serialized_end=286,
 )

-_CHANNELSETTINGS.fields_by_name['modem_config'].enum_type = _CHANNELSETTINGS_MODEMCONFIG
-_CHANNELSETTINGS_MODEMCONFIG.containing_type = _CHANNELSETTINGS
 _CHANNEL.fields_by_name['settings'].message_type = _CHANNELSETTINGS
 _CHANNEL.fields_by_name['role'].enum_type = _CHANNEL_ROLE
 _CHANNEL_ROLE.containing_type = _CHANNEL
--- a/meshtastic/config_pb2.py
+++ b/meshtastic/config_pb2.py
@@ -0,0 +1,921 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: config.proto
+
+from google.protobuf import descriptor as _descriptor
+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.FileDescriptor(
+  name='config.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\014ConfigProtosH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\x0c\x63onfig.proto\"\xf1\x11\n\x06\x43onfig\x12&\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x14.Config.DeviceConfigH\x00\x12*\n\x08position\x18\x02 \x01(\x0b\x32\x16.Config.PositionConfigH\x00\x12$\n\x05power\x18\x03 \x01(\x0b\x32\x13.Config.PowerConfigH\x00\x12\"\n\x04wifi\x18\x04 \x01(\x0b\x32\x12.Config.WiFiConfigH\x00\x12(\n\x07\x64isplay\x18\x05 \x01(\x0b\x32\x15.Config.DisplayConfigH\x00\x12\"\n\x04lora\x18\x06 \x01(\x0b\x32\x12.Config.LoRaConfigH\x00\x1a\xd8\x01\n\x0c\x44\x65viceConfig\x12\'\n\x04role\x18\x01 \x01(\x0e\x32\x19.Config.DeviceConfig.Role\x12\x17\n\x0fserial_disabled\x18\x02 \x01(\x08\x12\x15\n\rfactory_reset\x18\x03 \x01(\x08\x12\x19\n\x11\x64\x65\x62ug_log_enabled\x18\x04 \x01(\x08\x12\x12\n\nntp_server\x18\x05 \x01(\t\"@\n\x04Role\x12\n\n\x06\x43lient\x10\x00\x12\x0e\n\nClientMute\x10\x01\x12\n\n\x06Router\x10\x02\x12\x10\n\x0cRouterClient\x10\x03\x1a\x86\x03\n\x0ePositionConfig\x12\x1f\n\x17position_broadcast_secs\x18\x01 \x01(\r\x12)\n!position_broadcast_smart_disabled\x18\x02 \x01(\x08\x12\x16\n\x0e\x66ixed_position\x18\x03 \x01(\x08\x12\x14\n\x0cgps_disabled\x18\x05 \x01(\x08\x12\x1b\n\x13gps_update_interval\x18\x06 \x01(\r\x12\x18\n\x10gps_attempt_time\x18\x07 \x01(\r\x12\x16\n\x0eposition_flags\x18\n \x01(\r\"\xaa\x01\n\rPositionFlags\x12\x11\n\rPOS_UNDEFINED\x10\x00\x12\x10\n\x0cPOS_ALTITUDE\x10\x01\x12\x0f\n\x0bPOS_ALT_MSL\x10\x02\x12\x0f\n\x0bPOS_GEO_SEP\x10\x04\x12\x0b\n\x07POS_DOP\x10\x08\x12\r\n\tPOS_HVDOP\x10\x10\x12\x11\n\rPOS_SATINVIEW\x10 \x12\x0f\n\x0bPOS_SEQ_NOS\x10@\x12\x12\n\rPOS_TIMESTAMP\x10\x80\x01\x1a\x8f\x04\n\x0bPowerConfig\x12\x39\n\x0e\x63harge_current\x18\x01 \x01(\x0e\x32!.Config.PowerConfig.ChargeCurrent\x12\x17\n\x0fis_power_saving\x18\x02 \x01(\x08\x12\x19\n\x11is_always_powered\x18\x03 \x01(\x08\x12&\n\x1eon_battery_shutdown_after_secs\x18\x04 \x01(\r\x12\x1f\n\x17\x61\x64\x63_multiplier_override\x18\x06 \x01(\x02\x12\x1b\n\x13wait_bluetooth_secs\x18\x07 \x01(\r\x12\x1d\n\x15mesh_sds_timeout_secs\x18\t \x01(\r\x12\x10\n\x08sds_secs\x18\n \x01(\r\x12\x0f\n\x07ls_secs\x18\x0b \x01(\r\x12\x15\n\rmin_wake_secs\x18\x0c \x01(\r\"\xd1\x01\n\rChargeCurrent\x12\x0b\n\x07MAUnset\x10\x00\x12\t\n\x05MA100\x10\x01\x12\t\n\x05MA190\x10\x02\x12\t\n\x05MA280\x10\x03\x12\t\n\x05MA360\x10\x04\x12\t\n\x05MA450\x10\x05\x12\t\n\x05MA550\x10\x06\x12\t\n\x05MA630\x10\x07\x12\t\n\x05MA700\x10\x08\x12\t\n\x05MA780\x10\t\x12\t\n\x05MA880\x10\n\x12\t\n\x05MA960\x10\x0b\x12\n\n\x06MA1000\x10\x0c\x12\n\n\x06MA1080\x10\r\x12\n\n\x06MA1160\x10\x0e\x12\n\n\x06MA1240\x10\x0f\x12\n\n\x06MA1320\x10\x10\x1aK\n\nWiFiConfig\x12\x0c\n\x04ssid\x18\x01 \x01(\t\x12\x0b\n\x03psk\x18\x02 \x01(\t\x12\x0f\n\x07\x61p_mode\x18\x03 \x01(\x08\x12\x11\n\tap_hidden\x18\x04 \x01(\x08\x1a\x8f\x02\n\rDisplayConfig\x12\x16\n\x0escreen_on_secs\x18\x01 \x01(\r\x12=\n\ngps_format\x18\x02 \x01(\x0e\x32).Config.DisplayConfig.GpsCoordinateFormat\x12!\n\x19\x61uto_screen_carousel_secs\x18\x03 \x01(\r\"\x83\x01\n\x13GpsCoordinateFormat\x12\x10\n\x0cGpsFormatDec\x10\x00\x12\x10\n\x0cGpsFormatDMS\x10\x01\x12\x10\n\x0cGpsFormatUTM\x10\x02\x12\x11\n\rGpsFormatMGRS\x10\x03\x12\x10\n\x0cGpsFormatOLC\x10\x04\x12\x11\n\rGpsFormatOSGR\x10\x05\x1a\x93\x04\n\nLoRaConfig\x12\x10\n\x08tx_power\x18\x01 \x01(\x05\x12\x34\n\x0cmodem_preset\x18\x02 \x01(\x0e\x32\x1e.Config.LoRaConfig.ModemPreset\x12\x11\n\tbandwidth\x18\x03 \x01(\r\x12\x15\n\rspread_factor\x18\x04 \x01(\r\x12\x13\n\x0b\x63oding_rate\x18\x05 \x01(\r\x12\x18\n\x10\x66requency_offset\x18\x06 \x01(\x02\x12-\n\x06region\x18\x07 \x01(\x0e\x32\x1d.Config.LoRaConfig.RegionCode\x12\x11\n\thop_limit\x18\x08 \x01(\r\x12\x13\n\x0btx_disabled\x18\t \x01(\x08\x12\x17\n\x0fignore_incoming\x18g \x03(\r\"\x81\x01\n\nRegionCode\x12\t\n\x05Unset\x10\x00\x12\x06\n\x02US\x10\x01\x12\t\n\x05\x45U433\x10\x02\x12\t\n\x05\x45U868\x10\x03\x12\x06\n\x02\x43N\x10\x04\x12\x06\n\x02JP\x10\x05\x12\x07\n\x03\x41NZ\x10\x06\x12\x06\n\x02KR\x10\x07\x12\x06\n\x02TW\x10\x08\x12\x06\n\x02RU\x10\t\x12\x06\n\x02IN\x10\n\x12\t\n\x05NZ865\x10\x0b\x12\x06\n\x02TH\x10\x0c\"p\n\x0bModemPreset\x12\x0c\n\x08LongFast\x10\x00\x12\x0c\n\x08LongSlow\x10\x01\x12\r\n\tVLongSlow\x10\x02\x12\x0b\n\x07MidSlow\x10\x03\x12\x0b\n\x07MidFast\x10\x04\x12\r\n\tShortSlow\x10\x05\x12\r\n\tShortFast\x10\x06\x42\x10\n\x0epayloadVariantBH\n\x13\x63om.geeksville.meshB\x0c\x43onfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+)
+
+
+
+_CONFIG_DEVICECONFIG_ROLE = _descriptor.EnumDescriptor(
+  name='Role',
+  full_name='Config.DeviceConfig.Role',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='Client', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ClientMute', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='Router', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RouterClient', index=3, number=3,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=416,
+  serialized_end=480,
+)
+_sym_db.RegisterEnumDescriptor(_CONFIG_DEVICECONFIG_ROLE)
+
+_CONFIG_POSITIONCONFIG_POSITIONFLAGS = _descriptor.EnumDescriptor(
+  name='PositionFlags',
+  full_name='Config.PositionConfig.PositionFlags',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='POS_UNDEFINED', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POS_ALTITUDE', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POS_ALT_MSL', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POS_GEO_SEP', index=3, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POS_DOP', index=4, number=8,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POS_HVDOP', index=5, number=16,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POS_SATINVIEW', index=6, number=32,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POS_SEQ_NOS', index=7, number=64,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POS_TIMESTAMP', index=8, number=128,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=703,
+  serialized_end=873,
+)
+_sym_db.RegisterEnumDescriptor(_CONFIG_POSITIONCONFIG_POSITIONFLAGS)
+
+_CONFIG_POWERCONFIG_CHARGECURRENT = _descriptor.EnumDescriptor(
+  name='ChargeCurrent',
+  full_name='Config.PowerConfig.ChargeCurrent',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='MAUnset', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA100', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA190', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA280', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA360', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA450', index=5, number=5,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA550', index=6, number=6,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA630', index=7, number=7,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA700', index=8, number=8,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA780', index=9, number=9,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA880', index=10, number=10,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA960', index=11, number=11,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA1000', index=12, number=12,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA1080', index=13, number=13,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA1160', index=14, number=14,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA1240', index=15, number=15,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MA1320', index=16, number=16,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=1194,
+  serialized_end=1403,
+)
+_sym_db.RegisterEnumDescriptor(_CONFIG_POWERCONFIG_CHARGECURRENT)
+
+_CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT = _descriptor.EnumDescriptor(
+  name='GpsCoordinateFormat',
+  full_name='Config.DisplayConfig.GpsCoordinateFormat',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='GpsFormatDec', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GpsFormatDMS', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GpsFormatUTM', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GpsFormatMGRS', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GpsFormatOLC', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GpsFormatOSGR', index=5, number=5,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=1623,
+  serialized_end=1754,
+)
+_sym_db.RegisterEnumDescriptor(_CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT)
+
+_CONFIG_LORACONFIG_REGIONCODE = _descriptor.EnumDescriptor(
+  name='RegionCode',
+  full_name='Config.LoRaConfig.RegionCode',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='Unset', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='US', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='EU433', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='EU868', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CN', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='JP', index=5, number=5,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ANZ', index=6, number=6,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='KR', index=7, number=7,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TW', index=8, number=8,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RU', index=9, number=9,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IN', index=10, number=10,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NZ865', index=11, number=11,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TH', index=12, number=12,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=2045,
+  serialized_end=2174,
+)
+_sym_db.RegisterEnumDescriptor(_CONFIG_LORACONFIG_REGIONCODE)
+
+_CONFIG_LORACONFIG_MODEMPRESET = _descriptor.EnumDescriptor(
+  name='ModemPreset',
+  full_name='Config.LoRaConfig.ModemPreset',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='LongFast', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='LongSlow', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='VLongSlow', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MidSlow', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MidFast', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ShortSlow', index=5, number=5,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ShortFast', index=6, number=6,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=2176,
+  serialized_end=2288,
+)
+_sym_db.RegisterEnumDescriptor(_CONFIG_LORACONFIG_MODEMPRESET)
+
+
+_CONFIG_DEVICECONFIG = _descriptor.Descriptor(
+  name='DeviceConfig',
+  full_name='Config.DeviceConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='role', full_name='Config.DeviceConfig.role', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='serial_disabled', full_name='Config.DeviceConfig.serial_disabled', index=1,
+      number=2, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='factory_reset', full_name='Config.DeviceConfig.factory_reset', index=2,
+      number=3, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='debug_log_enabled', full_name='Config.DeviceConfig.debug_log_enabled', index=3,
+      number=4, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='ntp_server', full_name='Config.DeviceConfig.ntp_server', index=4,
+      number=5, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _CONFIG_DEVICECONFIG_ROLE,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=264,
+  serialized_end=480,
+)
+
+_CONFIG_POSITIONCONFIG = _descriptor.Descriptor(
+  name='PositionConfig',
+  full_name='Config.PositionConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='position_broadcast_secs', full_name='Config.PositionConfig.position_broadcast_secs', index=0,
+      number=1, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='position_broadcast_smart_disabled', full_name='Config.PositionConfig.position_broadcast_smart_disabled', index=1,
+      number=2, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='fixed_position', full_name='Config.PositionConfig.fixed_position', index=2,
+      number=3, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='gps_disabled', full_name='Config.PositionConfig.gps_disabled', index=3,
+      number=5, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='gps_update_interval', full_name='Config.PositionConfig.gps_update_interval', index=4,
+      number=6, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='gps_attempt_time', full_name='Config.PositionConfig.gps_attempt_time', index=5,
+      number=7, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='position_flags', full_name='Config.PositionConfig.position_flags', index=6,
+      number=10, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _CONFIG_POSITIONCONFIG_POSITIONFLAGS,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=483,
+  serialized_end=873,
+)
+
+_CONFIG_POWERCONFIG = _descriptor.Descriptor(
+  name='PowerConfig',
+  full_name='Config.PowerConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='charge_current', full_name='Config.PowerConfig.charge_current', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='is_power_saving', full_name='Config.PowerConfig.is_power_saving', index=1,
+      number=2, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='is_always_powered', full_name='Config.PowerConfig.is_always_powered', index=2,
+      number=3, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='on_battery_shutdown_after_secs', full_name='Config.PowerConfig.on_battery_shutdown_after_secs', index=3,
+      number=4, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='adc_multiplier_override', full_name='Config.PowerConfig.adc_multiplier_override', index=4,
+      number=6, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='wait_bluetooth_secs', full_name='Config.PowerConfig.wait_bluetooth_secs', index=5,
+      number=7, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='mesh_sds_timeout_secs', full_name='Config.PowerConfig.mesh_sds_timeout_secs', index=6,
+      number=9, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='sds_secs', full_name='Config.PowerConfig.sds_secs', index=7,
+      number=10, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='ls_secs', full_name='Config.PowerConfig.ls_secs', index=8,
+      number=11, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='min_wake_secs', full_name='Config.PowerConfig.min_wake_secs', index=9,
+      number=12, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _CONFIG_POWERCONFIG_CHARGECURRENT,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=876,
+  serialized_end=1403,
+)
+
+_CONFIG_WIFICONFIG = _descriptor.Descriptor(
+  name='WiFiConfig',
+  full_name='Config.WiFiConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='ssid', full_name='Config.WiFiConfig.ssid', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='psk', full_name='Config.WiFiConfig.psk', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='ap_mode', full_name='Config.WiFiConfig.ap_mode', index=2,
+      number=3, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='ap_hidden', full_name='Config.WiFiConfig.ap_hidden', index=3,
+      number=4, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1405,
+  serialized_end=1480,
+)
+
+_CONFIG_DISPLAYCONFIG = _descriptor.Descriptor(
+  name='DisplayConfig',
+  full_name='Config.DisplayConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='screen_on_secs', full_name='Config.DisplayConfig.screen_on_secs', index=0,
+      number=1, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='gps_format', full_name='Config.DisplayConfig.gps_format', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='auto_screen_carousel_secs', full_name='Config.DisplayConfig.auto_screen_carousel_secs', index=2,
+      number=3, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1483,
+  serialized_end=1754,
+)
+
+_CONFIG_LORACONFIG = _descriptor.Descriptor(
+  name='LoRaConfig',
+  full_name='Config.LoRaConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='tx_power', full_name='Config.LoRaConfig.tx_power', index=0,
+      number=1, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='modem_preset', full_name='Config.LoRaConfig.modem_preset', index=1,
+      number=2, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='bandwidth', full_name='Config.LoRaConfig.bandwidth', index=2,
+      number=3, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='spread_factor', full_name='Config.LoRaConfig.spread_factor', index=3,
+      number=4, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='coding_rate', full_name='Config.LoRaConfig.coding_rate', index=4,
+      number=5, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='frequency_offset', full_name='Config.LoRaConfig.frequency_offset', index=5,
+      number=6, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='region', full_name='Config.LoRaConfig.region', index=6,
+      number=7, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='hop_limit', full_name='Config.LoRaConfig.hop_limit', index=7,
+      number=8, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='tx_disabled', full_name='Config.LoRaConfig.tx_disabled', index=8,
+      number=9, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='ignore_incoming', full_name='Config.LoRaConfig.ignore_incoming', index=9,
+      number=103, type=13, cpp_type=3, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _CONFIG_LORACONFIG_REGIONCODE,
+    _CONFIG_LORACONFIG_MODEMPRESET,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1757,
+  serialized_end=2288,
+)
+
+_CONFIG = _descriptor.Descriptor(
+  name='Config',
+  full_name='Config',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='device', full_name='Config.device', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='position', full_name='Config.position', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='power', full_name='Config.power', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='wifi', full_name='Config.wifi', index=3,
+      number=4, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='display', full_name='Config.display', index=4,
+      number=5, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='lora', full_name='Config.lora', index=5,
+      number=6, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[_CONFIG_DEVICECONFIG, _CONFIG_POSITIONCONFIG, _CONFIG_POWERCONFIG, _CONFIG_WIFICONFIG, _CONFIG_DISPLAYCONFIG, _CONFIG_LORACONFIG, ],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+    _descriptor.OneofDescriptor(
+      name='payloadVariant', full_name='Config.payloadVariant',
+      index=0, containing_type=None, fields=[]),
+  ],
+  serialized_start=17,
+  serialized_end=2306,
+)
+
+_CONFIG_DEVICECONFIG.fields_by_name['role'].enum_type = _CONFIG_DEVICECONFIG_ROLE
+_CONFIG_DEVICECONFIG.containing_type = _CONFIG
+_CONFIG_DEVICECONFIG_ROLE.containing_type = _CONFIG_DEVICECONFIG
+_CONFIG_POSITIONCONFIG.containing_type = _CONFIG
+_CONFIG_POSITIONCONFIG_POSITIONFLAGS.containing_type = _CONFIG_POSITIONCONFIG
+_CONFIG_POWERCONFIG.fields_by_name['charge_current'].enum_type = _CONFIG_POWERCONFIG_CHARGECURRENT
+_CONFIG_POWERCONFIG.containing_type = _CONFIG
+_CONFIG_POWERCONFIG_CHARGECURRENT.containing_type = _CONFIG_POWERCONFIG
+_CONFIG_WIFICONFIG.containing_type = _CONFIG
+_CONFIG_DISPLAYCONFIG.fields_by_name['gps_format'].enum_type = _CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT
+_CONFIG_DISPLAYCONFIG.containing_type = _CONFIG
+_CONFIG_DISPLAYCONFIG_GPSCOORDINATEFORMAT.containing_type = _CONFIG_DISPLAYCONFIG
+_CONFIG_LORACONFIG.fields_by_name['modem_preset'].enum_type = _CONFIG_LORACONFIG_MODEMPRESET
+_CONFIG_LORACONFIG.fields_by_name['region'].enum_type = _CONFIG_LORACONFIG_REGIONCODE
+_CONFIG_LORACONFIG.containing_type = _CONFIG
+_CONFIG_LORACONFIG_REGIONCODE.containing_type = _CONFIG_LORACONFIG
+_CONFIG_LORACONFIG_MODEMPRESET.containing_type = _CONFIG_LORACONFIG
+_CONFIG.fields_by_name['device'].message_type = _CONFIG_DEVICECONFIG
+_CONFIG.fields_by_name['position'].message_type = _CONFIG_POSITIONCONFIG
+_CONFIG.fields_by_name['power'].message_type = _CONFIG_POWERCONFIG
+_CONFIG.fields_by_name['wifi'].message_type = _CONFIG_WIFICONFIG
+_CONFIG.fields_by_name['display'].message_type = _CONFIG_DISPLAYCONFIG
+_CONFIG.fields_by_name['lora'].message_type = _CONFIG_LORACONFIG
+_CONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _CONFIG.fields_by_name['device'])
+_CONFIG.fields_by_name['device'].containing_oneof = _CONFIG.oneofs_by_name['payloadVariant']
+_CONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _CONFIG.fields_by_name['position'])
+_CONFIG.fields_by_name['position'].containing_oneof = _CONFIG.oneofs_by_name['payloadVariant']
+_CONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _CONFIG.fields_by_name['power'])
+_CONFIG.fields_by_name['power'].containing_oneof = _CONFIG.oneofs_by_name['payloadVariant']
+_CONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _CONFIG.fields_by_name['wifi'])
+_CONFIG.fields_by_name['wifi'].containing_oneof = _CONFIG.oneofs_by_name['payloadVariant']
+_CONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _CONFIG.fields_by_name['display'])
+_CONFIG.fields_by_name['display'].containing_oneof = _CONFIG.oneofs_by_name['payloadVariant']
+_CONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _CONFIG.fields_by_name['lora'])
+_CONFIG.fields_by_name['lora'].containing_oneof = _CONFIG.oneofs_by_name['payloadVariant']
+DESCRIPTOR.message_types_by_name['Config'] = _CONFIG
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), {
+
+  'DeviceConfig' : _reflection.GeneratedProtocolMessageType('DeviceConfig', (_message.Message,), {
+    'DESCRIPTOR' : _CONFIG_DEVICECONFIG,
+    '__module__' : 'config_pb2'
+    # @@protoc_insertion_point(class_scope:Config.DeviceConfig)
+    })
+  ,
+
+  'PositionConfig' : _reflection.GeneratedProtocolMessageType('PositionConfig', (_message.Message,), {
+    'DESCRIPTOR' : _CONFIG_POSITIONCONFIG,
+    '__module__' : 'config_pb2'
+    # @@protoc_insertion_point(class_scope:Config.PositionConfig)
+    })
+  ,
+
+  'PowerConfig' : _reflection.GeneratedProtocolMessageType('PowerConfig', (_message.Message,), {
+    'DESCRIPTOR' : _CONFIG_POWERCONFIG,
+    '__module__' : 'config_pb2'
+    # @@protoc_insertion_point(class_scope:Config.PowerConfig)
+    })
+  ,
+
+  'WiFiConfig' : _reflection.GeneratedProtocolMessageType('WiFiConfig', (_message.Message,), {
+    'DESCRIPTOR' : _CONFIG_WIFICONFIG,
+    '__module__' : 'config_pb2'
+    # @@protoc_insertion_point(class_scope:Config.WiFiConfig)
+    })
+  ,
+
+  'DisplayConfig' : _reflection.GeneratedProtocolMessageType('DisplayConfig', (_message.Message,), {
+    'DESCRIPTOR' : _CONFIG_DISPLAYCONFIG,
+    '__module__' : 'config_pb2'
+    # @@protoc_insertion_point(class_scope:Config.DisplayConfig)
+    })
+  ,
+
+  'LoRaConfig' : _reflection.GeneratedProtocolMessageType('LoRaConfig', (_message.Message,), {
+    'DESCRIPTOR' : _CONFIG_LORACONFIG,
+    '__module__' : 'config_pb2'
+    # @@protoc_insertion_point(class_scope:Config.LoRaConfig)
+    })
+  ,
+  'DESCRIPTOR' : _CONFIG,
+  '__module__' : 'config_pb2'
+  # @@protoc_insertion_point(class_scope:Config)
+  })
+_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.DisplayConfig)
+_sym_db.RegisterMessage(Config.LoRaConfig)
+
+
+DESCRIPTOR._options = None
+# @@protoc_insertion_point(module_scope)
--- a/meshtastic/deviceonly_pb2.py
+++ b/meshtastic/deviceonly_pb2.py
@@ -2,6 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: deviceonly.proto

+from google.protobuf.internal import enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
@@ -20,10 +21,40 @@ DESCRIPTOR = _descriptor.FileDescriptor(
  package='',
  syntax='proto3',
  serialized_options=b'\n\023com.geeksville.meshB\nDeviceOnlyH\003Z!github.com/meshtastic/gomeshproto',
-  serialized_pb=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.ChannelBF\n\x13\x63om.geeksville.meshB\nDeviceOnlyH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+  serialized_pb=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'
  ,
  dependencies=[channel__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,])

+_SCREENFONTS = _descriptor.EnumDescriptor(
+  name='ScreenFonts',
+  full_name='ScreenFonts',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='FONT_SMALL', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FONT_MEDIUM', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='FONT_LARGE', index=2, number=2,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=475,
+  serialized_end=537,
+)
+_sym_db.RegisterEnumDescriptor(_SCREENFONTS)
+
+ScreenFonts = enum_type_wrapper.EnumTypeWrapper(_SCREENFONTS)
+FONT_SMALL = 0
+FONT_MEDIUM = 1
+FONT_LARGE = 2



@@ -121,6 +152,13 @@ _CHANNELFILE = _descriptor.Descriptor(
      message_type=None, enum_type=None, containing_type=None,
      is_extension=False, extension_scope=None,
      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='version', full_name='ChannelFile.version', index=1,
+      number=2, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
  ],
  extensions=[
  ],
@@ -134,7 +172,66 @@ _CHANNELFILE = _descriptor.Descriptor(
  oneofs=[
  ],
  serialized_start=280,
-  serialized_end=321,
+  serialized_end=338,
+)
+
+
+_OEMSTORE = _descriptor.Descriptor(
+  name='OEMStore',
+  full_name='OEMStore',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='oem_icon_width', full_name='OEMStore.oem_icon_width', index=0,
+      number=1, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='oem_icon_height', full_name='OEMStore.oem_icon_height', index=1,
+      number=2, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='oem_icon_bits', full_name='OEMStore.oem_icon_bits', index=2,
+      number=3, type=12, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"",
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='oem_font', full_name='OEMStore.oem_font', index=3,
+      number=4, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='oem_text', full_name='OEMStore.oem_text', index=4,
+      number=5, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=341,
+  serialized_end=473,
 )

 _DEVICESTATE.fields_by_name['my_node'].message_type = mesh__pb2._MYNODEINFO
@@ -143,8 +240,11 @@ _DEVICESTATE.fields_by_name['node_db'].message_type = mesh__pb2._NODEINFO
 _DEVICESTATE.fields_by_name['receive_queue'].message_type = mesh__pb2._MESHPACKET
 _DEVICESTATE.fields_by_name['rx_text_message'].message_type = mesh__pb2._MESHPACKET
 _CHANNELFILE.fields_by_name['channels'].message_type = channel__pb2._CHANNEL
+_OEMSTORE.fields_by_name['oem_font'].enum_type = _SCREENFONTS
 DESCRIPTOR.message_types_by_name['DeviceState'] = _DEVICESTATE
 DESCRIPTOR.message_types_by_name['ChannelFile'] = _CHANNELFILE
+DESCRIPTOR.message_types_by_name['OEMStore'] = _OEMSTORE
+DESCRIPTOR.enum_types_by_name['ScreenFonts'] = _SCREENFONTS
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)

 DeviceState = _reflection.GeneratedProtocolMessageType('DeviceState', (_message.Message,), {
@@ -161,6 +261,13 @@ ChannelFile = _reflection.GeneratedProtocolMessageType('ChannelFile', (_message.
  })
 _sym_db.RegisterMessage(ChannelFile)

+OEMStore = _reflection.GeneratedProtocolMessageType('OEMStore', (_message.Message,), {
+  'DESCRIPTOR' : _OEMSTORE,
+  '__module__' : 'deviceonly_pb2'
+  # @@protoc_insertion_point(class_scope:OEMStore)
+  })
+_sym_db.RegisterMessage(OEMStore)
+

 DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/localonly_pb2.py
+++ b/meshtastic/localonly_pb2.py
@@ -0,0 +1,215 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: localonly.proto
+
+from google.protobuf import descriptor as _descriptor
+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()
+
+
+from . import config_pb2 as config__pb2
+from . import module_config_pb2 as module__config__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='localonly.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\017LocalOnlyProtosH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=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'
+  ,
+  dependencies=[config__pb2.DESCRIPTOR,module__config__pb2.DESCRIPTOR,])
+
+
+
+
+_LOCALCONFIG = _descriptor.Descriptor(
+  name='LocalConfig',
+  full_name='LocalConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='device', full_name='LocalConfig.device', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='position', full_name='LocalConfig.position', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='power', full_name='LocalConfig.power', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='wifi', full_name='LocalConfig.wifi', index=3,
+      number=4, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='display', full_name='LocalConfig.display', index=4,
+      number=5, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='lora', full_name='LocalConfig.lora', index=5,
+      number=6, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='version', full_name='LocalConfig.version', index=6,
+      number=7, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=55,
+  serialized_end=309,
+)
+
+
+_LOCALMODULECONFIG = _descriptor.Descriptor(
+  name='LocalModuleConfig',
+  full_name='LocalModuleConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='mqtt', full_name='LocalModuleConfig.mqtt', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='serial', full_name='LocalModuleConfig.serial', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='external_notification', full_name='LocalModuleConfig.external_notification', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='store_forward', full_name='LocalModuleConfig.store_forward', index=3,
+      number=4, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='range_test', full_name='LocalModuleConfig.range_test', index=4,
+      number=5, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='telemetry', full_name='LocalModuleConfig.telemetry', index=5,
+      number=6, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='canned_message', full_name='LocalModuleConfig.canned_message', index=6,
+      number=7, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='version', full_name='LocalModuleConfig.version', index=7,
+      number=8, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=312,
+  serialized_end=722,
+)
+
+_LOCALCONFIG.fields_by_name['device'].message_type = config__pb2._CONFIG_DEVICECONFIG
+_LOCALCONFIG.fields_by_name['position'].message_type = config__pb2._CONFIG_POSITIONCONFIG
+_LOCALCONFIG.fields_by_name['power'].message_type = config__pb2._CONFIG_POWERCONFIG
+_LOCALCONFIG.fields_by_name['wifi'].message_type = config__pb2._CONFIG_WIFICONFIG
+_LOCALCONFIG.fields_by_name['display'].message_type = config__pb2._CONFIG_DISPLAYCONFIG
+_LOCALCONFIG.fields_by_name['lora'].message_type = config__pb2._CONFIG_LORACONFIG
+_LOCALMODULECONFIG.fields_by_name['mqtt'].message_type = module__config__pb2._MODULECONFIG_MQTTCONFIG
+_LOCALMODULECONFIG.fields_by_name['serial'].message_type = module__config__pb2._MODULECONFIG_SERIALCONFIG
+_LOCALMODULECONFIG.fields_by_name['external_notification'].message_type = module__config__pb2._MODULECONFIG_EXTERNALNOTIFICATIONCONFIG
+_LOCALMODULECONFIG.fields_by_name['store_forward'].message_type = module__config__pb2._MODULECONFIG_STOREFORWARDCONFIG
+_LOCALMODULECONFIG.fields_by_name['range_test'].message_type = module__config__pb2._MODULECONFIG_RANGETESTCONFIG
+_LOCALMODULECONFIG.fields_by_name['telemetry'].message_type = module__config__pb2._MODULECONFIG_TELEMETRYCONFIG
+_LOCALMODULECONFIG.fields_by_name['canned_message'].message_type = module__config__pb2._MODULECONFIG_CANNEDMESSAGECONFIG
+DESCRIPTOR.message_types_by_name['LocalConfig'] = _LOCALCONFIG
+DESCRIPTOR.message_types_by_name['LocalModuleConfig'] = _LOCALMODULECONFIG
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+LocalConfig = _reflection.GeneratedProtocolMessageType('LocalConfig', (_message.Message,), {
+  'DESCRIPTOR' : _LOCALCONFIG,
+  '__module__' : 'localonly_pb2'
+  # @@protoc_insertion_point(class_scope:LocalConfig)
+  })
+_sym_db.RegisterMessage(LocalConfig)
+
+LocalModuleConfig = _reflection.GeneratedProtocolMessageType('LocalModuleConfig', (_message.Message,), {
+  'DESCRIPTOR' : _LOCALMODULECONFIG,
+  '__module__' : 'localonly_pb2'
+  # @@protoc_insertion_point(class_scope:LocalModuleConfig)
+  })
+_sym_db.RegisterMessage(LocalModuleConfig)
+
+
+DESCRIPTOR._options = None
+# @@protoc_insertion_point(module_scope)
--- a/meshtastic/mesh_pb2.py
+++ b/meshtastic/mesh_pb2.py
--- a/meshtastic/module_config_pb2.py
+++ b/meshtastic/module_config_pb2.py
@@ -0,0 +1,852 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: module_config.proto
+
+from google.protobuf import descriptor as _descriptor
+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()
+
+
+from . import telemetry_pb2 as telemetry__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='module_config.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\022ModuleConfigProtosH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=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'
+  ,
+  dependencies=[telemetry__pb2.DESCRIPTOR,])
+
+
+
+_MODULECONFIG_SERIALCONFIG_SERIAL_BAUD = _descriptor.EnumDescriptor(
+  name='Serial_Baud',
+  full_name='ModuleConfig.SerialConfig.Serial_Baud',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_Default', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_110', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_300', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_600', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_1200', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_2400', index=5, number=5,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_4800', index=6, number=6,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_9600', index=7, number=7,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_19200', index=8, number=8,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_38400', index=9, number=9,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_57600', index=10, number=10,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_115200', index=11, number=11,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_230400', index=12, number=12,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_460800', index=13, number=13,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_576000', index=14, number=14,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BAUD_921600', index=15, number=15,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=758,
+  serialized_end=1024,
+)
+_sym_db.RegisterEnumDescriptor(_MODULECONFIG_SERIALCONFIG_SERIAL_BAUD)
+
+_MODULECONFIG_SERIALCONFIG_SERIAL_MODE = _descriptor.EnumDescriptor(
+  name='Serial_Mode',
+  full_name='ModuleConfig.SerialConfig.Serial_Mode',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='MODE_Default', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MODE_SIMPLE', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MODE_PROTO', index=2, number=2,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=1026,
+  serialized_end=1090,
+)
+_sym_db.RegisterEnumDescriptor(_MODULECONFIG_SERIALCONFIG_SERIAL_MODE)
+
+_MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR = _descriptor.EnumDescriptor(
+  name='InputEventChar',
+  full_name='ModuleConfig.CannedMessageConfig.InputEventChar',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='KEY_NONE', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='KEY_UP', index=1, number=17,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='KEY_DOWN', index=2, number=18,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='KEY_LEFT', index=3, number=19,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='KEY_RIGHT', index=4, number=20,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='KEY_SELECT', index=5, number=10,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='KEY_BACK', index=6, number=27,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='KEY_CANCEL', index=7, number=24,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=2283,
+  serialized_end=2414,
+)
+_sym_db.RegisterEnumDescriptor(_MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR)
+
+
+_MODULECONFIG_MQTTCONFIG = _descriptor.Descriptor(
+  name='MQTTConfig',
+  full_name='ModuleConfig.MQTTConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='disabled', full_name='ModuleConfig.MQTTConfig.disabled', index=0,
+      number=1, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='address', full_name='ModuleConfig.MQTTConfig.address', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='username', full_name='ModuleConfig.MQTTConfig.username', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='password', full_name='ModuleConfig.MQTTConfig.password', index=3,
+      number=4, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='encryption_enabled', full_name='ModuleConfig.MQTTConfig.encryption_enabled', index=4,
+      number=5, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=445,
+  serialized_end=556,
+)
+
+_MODULECONFIG_SERIALCONFIG = _descriptor.Descriptor(
+  name='SerialConfig',
+  full_name='ModuleConfig.SerialConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='enabled', full_name='ModuleConfig.SerialConfig.enabled', index=0,
+      number=1, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='echo', full_name='ModuleConfig.SerialConfig.echo', index=1,
+      number=2, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='rxd', full_name='ModuleConfig.SerialConfig.rxd', index=2,
+      number=3, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='txd', full_name='ModuleConfig.SerialConfig.txd', index=3,
+      number=4, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='baud', full_name='ModuleConfig.SerialConfig.baud', index=4,
+      number=5, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='timeout', full_name='ModuleConfig.SerialConfig.timeout', index=5,
+      number=6, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='mode', full_name='ModuleConfig.SerialConfig.mode', index=6,
+      number=7, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _MODULECONFIG_SERIALCONFIG_SERIAL_BAUD,
+    _MODULECONFIG_SERIALCONFIG_SERIAL_MODE,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=559,
+  serialized_end=1090,
+)
+
+_MODULECONFIG_EXTERNALNOTIFICATIONCONFIG = _descriptor.Descriptor(
+  name='ExternalNotificationConfig',
+  full_name='ModuleConfig.ExternalNotificationConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='enabled', full_name='ModuleConfig.ExternalNotificationConfig.enabled', index=0,
+      number=1, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='output_ms', full_name='ModuleConfig.ExternalNotificationConfig.output_ms', index=1,
+      number=2, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='output', full_name='ModuleConfig.ExternalNotificationConfig.output', index=2,
+      number=3, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='active', full_name='ModuleConfig.ExternalNotificationConfig.active', index=3,
+      number=4, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='alert_message', full_name='ModuleConfig.ExternalNotificationConfig.alert_message', index=4,
+      number=5, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='alert_bell', full_name='ModuleConfig.ExternalNotificationConfig.alert_bell', index=5,
+      number=6, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1093,
+  serialized_end=1232,
+)
+
+_MODULECONFIG_STOREFORWARDCONFIG = _descriptor.Descriptor(
+  name='StoreForwardConfig',
+  full_name='ModuleConfig.StoreForwardConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='enabled', full_name='ModuleConfig.StoreForwardConfig.enabled', index=0,
+      number=1, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='heartbeat', full_name='ModuleConfig.StoreForwardConfig.heartbeat', index=1,
+      number=2, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='records', full_name='ModuleConfig.StoreForwardConfig.records', index=2,
+      number=3, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='history_return_max', full_name='ModuleConfig.StoreForwardConfig.history_return_max', index=3,
+      number=4, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='history_return_window', full_name='ModuleConfig.StoreForwardConfig.history_return_window', index=4,
+      number=5, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1235,
+  serialized_end=1367,
+)
+
+_MODULECONFIG_RANGETESTCONFIG = _descriptor.Descriptor(
+  name='RangeTestConfig',
+  full_name='ModuleConfig.RangeTestConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='enabled', full_name='ModuleConfig.RangeTestConfig.enabled', index=0,
+      number=1, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='sender', full_name='ModuleConfig.RangeTestConfig.sender', index=1,
+      number=2, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='save', full_name='ModuleConfig.RangeTestConfig.save', index=2,
+      number=3, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1369,
+  serialized_end=1433,
+)
+
+_MODULECONFIG_TELEMETRYCONFIG = _descriptor.Descriptor(
+  name='TelemetryConfig',
+  full_name='ModuleConfig.TelemetryConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='device_update_interval', full_name='ModuleConfig.TelemetryConfig.device_update_interval', index=0,
+      number=1, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='environment_update_interval', full_name='ModuleConfig.TelemetryConfig.environment_update_interval', index=1,
+      number=2, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='environment_measurement_enabled', full_name='ModuleConfig.TelemetryConfig.environment_measurement_enabled', index=2,
+      number=3, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='environment_screen_enabled', full_name='ModuleConfig.TelemetryConfig.environment_screen_enabled', index=3,
+      number=4, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='environment_read_error_count_threshold', full_name='ModuleConfig.TelemetryConfig.environment_read_error_count_threshold', index=4,
+      number=5, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='environment_recovery_interval', full_name='ModuleConfig.TelemetryConfig.environment_recovery_interval', index=5,
+      number=6, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='environment_display_fahrenheit', full_name='ModuleConfig.TelemetryConfig.environment_display_fahrenheit', index=6,
+      number=7, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='environment_sensor_type', full_name='ModuleConfig.TelemetryConfig.environment_sensor_type', index=7,
+      number=8, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='environment_sensor_pin', full_name='ModuleConfig.TelemetryConfig.environment_sensor_pin', index=8,
+      number=9, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1436,
+  serialized_end=1813,
+)
+
+_MODULECONFIG_CANNEDMESSAGECONFIG = _descriptor.Descriptor(
+  name='CannedMessageConfig',
+  full_name='ModuleConfig.CannedMessageConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='rotary1_enabled', full_name='ModuleConfig.CannedMessageConfig.rotary1_enabled', index=0,
+      number=1, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='inputbroker_pin_a', full_name='ModuleConfig.CannedMessageConfig.inputbroker_pin_a', index=1,
+      number=2, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='inputbroker_pin_b', full_name='ModuleConfig.CannedMessageConfig.inputbroker_pin_b', index=2,
+      number=3, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='inputbroker_pin_press', full_name='ModuleConfig.CannedMessageConfig.inputbroker_pin_press', index=3,
+      number=4, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='inputbroker_event_cw', full_name='ModuleConfig.CannedMessageConfig.inputbroker_event_cw', index=4,
+      number=5, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='inputbroker_event_ccw', full_name='ModuleConfig.CannedMessageConfig.inputbroker_event_ccw', index=5,
+      number=6, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='inputbroker_event_press', full_name='ModuleConfig.CannedMessageConfig.inputbroker_event_press', index=6,
+      number=7, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='updown1_enabled', full_name='ModuleConfig.CannedMessageConfig.updown1_enabled', index=7,
+      number=8, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='enabled', full_name='ModuleConfig.CannedMessageConfig.enabled', index=8,
+      number=9, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='allow_input_source', full_name='ModuleConfig.CannedMessageConfig.allow_input_source', index=9,
+      number=10, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='send_bell', full_name='ModuleConfig.CannedMessageConfig.send_bell', index=10,
+      number=11, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=1816,
+  serialized_end=2414,
+)
+
+_MODULECONFIG = _descriptor.Descriptor(
+  name='ModuleConfig',
+  full_name='ModuleConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='mqtt', full_name='ModuleConfig.mqtt', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='serial', full_name='ModuleConfig.serial', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='external_notification', full_name='ModuleConfig.external_notification', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='store_forward', full_name='ModuleConfig.store_forward', index=3,
+      number=4, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='range_test', full_name='ModuleConfig.range_test', index=4,
+      number=5, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='telemetry', full_name='ModuleConfig.telemetry', index=5,
+      number=6, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='canned_message', full_name='ModuleConfig.canned_message', index=6,
+      number=7, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[_MODULECONFIG_MQTTCONFIG, _MODULECONFIG_SERIALCONFIG, _MODULECONFIG_EXTERNALNOTIFICATIONCONFIG, _MODULECONFIG_STOREFORWARDCONFIG, _MODULECONFIG_RANGETESTCONFIG, _MODULECONFIG_TELEMETRYCONFIG, _MODULECONFIG_CANNEDMESSAGECONFIG, ],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+    _descriptor.OneofDescriptor(
+      name='payloadVariant', full_name='ModuleConfig.payloadVariant',
+      index=0, containing_type=None, fields=[]),
+  ],
+  serialized_start=41,
+  serialized_end=2432,
+)
+
+_MODULECONFIG_MQTTCONFIG.containing_type = _MODULECONFIG
+_MODULECONFIG_SERIALCONFIG.fields_by_name['baud'].enum_type = _MODULECONFIG_SERIALCONFIG_SERIAL_BAUD
+_MODULECONFIG_SERIALCONFIG.fields_by_name['mode'].enum_type = _MODULECONFIG_SERIALCONFIG_SERIAL_MODE
+_MODULECONFIG_SERIALCONFIG.containing_type = _MODULECONFIG
+_MODULECONFIG_SERIALCONFIG_SERIAL_BAUD.containing_type = _MODULECONFIG_SERIALCONFIG
+_MODULECONFIG_SERIALCONFIG_SERIAL_MODE.containing_type = _MODULECONFIG_SERIALCONFIG
+_MODULECONFIG_EXTERNALNOTIFICATIONCONFIG.containing_type = _MODULECONFIG
+_MODULECONFIG_STOREFORWARDCONFIG.containing_type = _MODULECONFIG
+_MODULECONFIG_RANGETESTCONFIG.containing_type = _MODULECONFIG
+_MODULECONFIG_TELEMETRYCONFIG.fields_by_name['environment_sensor_type'].enum_type = telemetry__pb2._TELEMETRYSENSORTYPE
+_MODULECONFIG_TELEMETRYCONFIG.containing_type = _MODULECONFIG
+_MODULECONFIG_CANNEDMESSAGECONFIG.fields_by_name['inputbroker_event_cw'].enum_type = _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR
+_MODULECONFIG_CANNEDMESSAGECONFIG.fields_by_name['inputbroker_event_ccw'].enum_type = _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR
+_MODULECONFIG_CANNEDMESSAGECONFIG.fields_by_name['inputbroker_event_press'].enum_type = _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR
+_MODULECONFIG_CANNEDMESSAGECONFIG.containing_type = _MODULECONFIG
+_MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR.containing_type = _MODULECONFIG_CANNEDMESSAGECONFIG
+_MODULECONFIG.fields_by_name['mqtt'].message_type = _MODULECONFIG_MQTTCONFIG
+_MODULECONFIG.fields_by_name['serial'].message_type = _MODULECONFIG_SERIALCONFIG
+_MODULECONFIG.fields_by_name['external_notification'].message_type = _MODULECONFIG_EXTERNALNOTIFICATIONCONFIG
+_MODULECONFIG.fields_by_name['store_forward'].message_type = _MODULECONFIG_STOREFORWARDCONFIG
+_MODULECONFIG.fields_by_name['range_test'].message_type = _MODULECONFIG_RANGETESTCONFIG
+_MODULECONFIG.fields_by_name['telemetry'].message_type = _MODULECONFIG_TELEMETRYCONFIG
+_MODULECONFIG.fields_by_name['canned_message'].message_type = _MODULECONFIG_CANNEDMESSAGECONFIG
+_MODULECONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _MODULECONFIG.fields_by_name['mqtt'])
+_MODULECONFIG.fields_by_name['mqtt'].containing_oneof = _MODULECONFIG.oneofs_by_name['payloadVariant']
+_MODULECONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _MODULECONFIG.fields_by_name['serial'])
+_MODULECONFIG.fields_by_name['serial'].containing_oneof = _MODULECONFIG.oneofs_by_name['payloadVariant']
+_MODULECONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _MODULECONFIG.fields_by_name['external_notification'])
+_MODULECONFIG.fields_by_name['external_notification'].containing_oneof = _MODULECONFIG.oneofs_by_name['payloadVariant']
+_MODULECONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _MODULECONFIG.fields_by_name['store_forward'])
+_MODULECONFIG.fields_by_name['store_forward'].containing_oneof = _MODULECONFIG.oneofs_by_name['payloadVariant']
+_MODULECONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _MODULECONFIG.fields_by_name['range_test'])
+_MODULECONFIG.fields_by_name['range_test'].containing_oneof = _MODULECONFIG.oneofs_by_name['payloadVariant']
+_MODULECONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _MODULECONFIG.fields_by_name['telemetry'])
+_MODULECONFIG.fields_by_name['telemetry'].containing_oneof = _MODULECONFIG.oneofs_by_name['payloadVariant']
+_MODULECONFIG.oneofs_by_name['payloadVariant'].fields.append(
+  _MODULECONFIG.fields_by_name['canned_message'])
+_MODULECONFIG.fields_by_name['canned_message'].containing_oneof = _MODULECONFIG.oneofs_by_name['payloadVariant']
+DESCRIPTOR.message_types_by_name['ModuleConfig'] = _MODULECONFIG
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+ModuleConfig = _reflection.GeneratedProtocolMessageType('ModuleConfig', (_message.Message,), {
+
+  'MQTTConfig' : _reflection.GeneratedProtocolMessageType('MQTTConfig', (_message.Message,), {
+    'DESCRIPTOR' : _MODULECONFIG_MQTTCONFIG,
+    '__module__' : 'module_config_pb2'
+    # @@protoc_insertion_point(class_scope:ModuleConfig.MQTTConfig)
+    })
+  ,
+
+  'SerialConfig' : _reflection.GeneratedProtocolMessageType('SerialConfig', (_message.Message,), {
+    'DESCRIPTOR' : _MODULECONFIG_SERIALCONFIG,
+    '__module__' : 'module_config_pb2'
+    # @@protoc_insertion_point(class_scope:ModuleConfig.SerialConfig)
+    })
+  ,
+
+  'ExternalNotificationConfig' : _reflection.GeneratedProtocolMessageType('ExternalNotificationConfig', (_message.Message,), {
+    'DESCRIPTOR' : _MODULECONFIG_EXTERNALNOTIFICATIONCONFIG,
+    '__module__' : 'module_config_pb2'
+    # @@protoc_insertion_point(class_scope:ModuleConfig.ExternalNotificationConfig)
+    })
+  ,
+
+  'StoreForwardConfig' : _reflection.GeneratedProtocolMessageType('StoreForwardConfig', (_message.Message,), {
+    'DESCRIPTOR' : _MODULECONFIG_STOREFORWARDCONFIG,
+    '__module__' : 'module_config_pb2'
+    # @@protoc_insertion_point(class_scope:ModuleConfig.StoreForwardConfig)
+    })
+  ,
+
+  'RangeTestConfig' : _reflection.GeneratedProtocolMessageType('RangeTestConfig', (_message.Message,), {
+    'DESCRIPTOR' : _MODULECONFIG_RANGETESTCONFIG,
+    '__module__' : 'module_config_pb2'
+    # @@protoc_insertion_point(class_scope:ModuleConfig.RangeTestConfig)
+    })
+  ,
+
+  'TelemetryConfig' : _reflection.GeneratedProtocolMessageType('TelemetryConfig', (_message.Message,), {
+    'DESCRIPTOR' : _MODULECONFIG_TELEMETRYCONFIG,
+    '__module__' : 'module_config_pb2'
+    # @@protoc_insertion_point(class_scope:ModuleConfig.TelemetryConfig)
+    })
+  ,
+
+  'CannedMessageConfig' : _reflection.GeneratedProtocolMessageType('CannedMessageConfig', (_message.Message,), {
+    'DESCRIPTOR' : _MODULECONFIG_CANNEDMESSAGECONFIG,
+    '__module__' : 'module_config_pb2'
+    # @@protoc_insertion_point(class_scope:ModuleConfig.CannedMessageConfig)
+    })
+  ,
+  'DESCRIPTOR' : _MODULECONFIG,
+  '__module__' : 'module_config_pb2'
+  # @@protoc_insertion_point(class_scope:ModuleConfig)
+  })
+_sym_db.RegisterMessage(ModuleConfig)
+_sym_db.RegisterMessage(ModuleConfig.MQTTConfig)
+_sym_db.RegisterMessage(ModuleConfig.SerialConfig)
+_sym_db.RegisterMessage(ModuleConfig.ExternalNotificationConfig)
+_sym_db.RegisterMessage(ModuleConfig.StoreForwardConfig)
+_sym_db.RegisterMessage(ModuleConfig.RangeTestConfig)
+_sym_db.RegisterMessage(ModuleConfig.TelemetryConfig)
+_sym_db.RegisterMessage(ModuleConfig.CannedMessageConfig)
+
+
+DESCRIPTOR._options = None
+# @@protoc_insertion_point(module_scope)
--- a/meshtastic/node.py
+++ b/meshtastic/node.py
@@ -20,6 +20,7 @@ class Node:
        self.iface = iface
        self.nodeNum = nodeNum
        self.radioConfig = None
+        self.partialConfig = None
        self.channels = None
        self._timeout = Timeout(maxSecs=300)
        self.partialChannels = None
@@ -63,6 +64,7 @@ class Node:
        """Send regular MeshPackets to ask for settings and channels."""
        logging.debug(f"requestConfig for nodeNum:{self.nodeNum}")
        self.radioConfig = None
+        self.partialConfig = []
        self.channels = None
        self.partialChannels = []  # We keep our channels in a temp array until finished

@@ -252,7 +254,7 @@ class Node:


    def onResponseRequestSettings(self, p):
-        """Handle the response packet for requesting settings _requestSettings()"""
+        """Handle the response packets for requesting settings _requestSettings()"""
        logging.debug(f'onResponseRequestSetting() p:{p}')
        errorFound = False
        if "routing" in p["decoded"]:
@@ -260,18 +262,14 @@ class Node:
                errorFound = True
                print(f'Error on response: {p["decoded"]["routing"]["errorReason"]}')
        if errorFound is False:
-            self.radioConfig = p["decoded"]["admin"]["raw"].get_radio_response
-            logging.debug(f'self.radioConfig:{self.radioConfig}')
-            logging.debug("Received radio config, now fetching channels...")
+            self.partialConfig[p["decoded"]["admin"]["payloadVariant"]] = p["decoded"]["admin"]["raw"].get_config_response
+            logging.debug(f'self.partialConfig:{self.partialConfig}')
            self._timeout.reset()  # We made foreward progress
-            self._requestChannel(0)  # now start fetching channels
-
+            self.gotResponse = True

    def _requestSettings(self):
        """Done with initial config messages, now send regular
           MeshPackets to ask for settings."""
-        p = admin_pb2.AdminMessage()
-        p.get_radio_request = True

        # TODO: should we check that localNode has an 'admin' channel?
        # Show progress message for super slow operations
@@ -283,8 +281,53 @@ class Node:
            print(" 3. All devices have the same modem config. (i.e., '--ch-longfast')")
            print(" 4. All devices have been rebooted after all of the above. (optional, but recommended)")
            print("Note: This could take a while (it requests remote channel configs, then writes config)")
+        
+        p1 = admin_pb2.AdminMessage()
+        p1.get_config_request = admin_pb2.AdminMessage.ConfigType.DEVICE_CONFIG;
+        self.gotResponse = False
+        self._sendAdmin(p1, wantResponse=True, onResponse=self.onResponseRequestSettings)
+        while self.gotResponse is False:
+                time.sleep(0.1)

-        return self._sendAdmin(p, wantResponse=True, onResponse=self.onResponseRequestSettings)
+        p2 = admin_pb2.AdminMessage()
+        p2.get_config_request = admin_pb2.AdminMessage.ConfigType.POSITION_CONFIG;
+        self.gotResponse = False
+        self._sendAdmin(p2, wantResponse=True, onResponse=self.onResponseRequestSettings)
+        while self.gotResponse is False:
+                time.sleep(0.1)
+
+        p3 = admin_pb2.AdminMessage()
+        p3.get_config_request = admin_pb2.AdminMessage.ConfigType.POWER_CONFIG;
+        self.gotResponse = False
+        self._sendAdmin(p3, wantResponse=True, onResponse=self.onResponseRequestSettings)
+        while self.gotResponse is False:
+                time.sleep(0.1)
+
+        p4 = admin_pb2.AdminMessage()
+        p4.get_config_request = admin_pb2.AdminMessage.ConfigType.WIFI_CONFIG;
+        self.gotResponse = False
+        self._sendAdmin(p4, wantResponse=True, onResponse=self.onResponseRequestSettings)
+        while self.gotResponse is False:
+                time.sleep(0.1)
+
+        p5 = admin_pb2.AdminMessage()
+        p5.get_config_request = admin_pb2.AdminMessage.ConfigType.DISPLAY_CONFIG;
+        self.gotResponse = False
+        self._sendAdmin(p5, wantResponse=True, onResponse=self.onResponseRequestSettings)
+        while self.gotResponse is False:
+                time.sleep(0.1)
+
+        p6 = admin_pb2.AdminMessage()
+        p6.get_config_request = admin_pb2.AdminMessage.ConfigType.LORA_CONFIG;
+        self.gotResponse = False
+        self._sendAdmin(p6, wantResponse=True, onResponse=self.onResponseRequestSettings)
+        while self.gotResponse is False:
+                time.sleep(0.1)
+
+        # TODO Assemble radioConfig
+
+        logging.debug("Received config, now fetching channels...")
+        self._requestChannel(0)  # now start fetching channels

    def onResponseRequestCannedMessagePluginMessagePart1(self, p):
        """Handle the response packet for requesting canned message plugin message part 1"""
@@ -298,7 +341,7 @@ 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_plugin_part1_response
+                        self.cannedPluginMessagePart1 = p["decoded"]["admin"]["raw"].get_canned_message_module_part1_response
                        logging.debug(f'self.cannedPluginMessagePart1:{self.cannedPluginMessagePart1}')
                        self.gotResponse = True

@@ -314,7 +357,7 @@ class Node:
            if "decoded" in p:
                if "admin" in p["decoded"]:
                    if "raw" in p["decoded"]["admin"]:
-                        self.cannedPluginMessagePart2 = p["decoded"]["admin"]["raw"].get_canned_message_plugin_part2_response
+                        self.cannedPluginMessagePart2 = p["decoded"]["admin"]["raw"].get_canned_message_module_part2_response
                        logging.debug(f'self.cannedPluginMessagePart2:{self.cannedPluginMessagePart2}')
                        self.gotResponse = True

@@ -330,7 +373,7 @@ class Node:
            if "decoded" in p:
                if "admin" in p["decoded"]:
                    if "raw" in p["decoded"]["admin"]:
-                        self.cannedPluginMessagePart3 = p["decoded"]["admin"]["raw"].get_canned_message_plugin_part3_response
+                        self.cannedPluginMessagePart3 = p["decoded"]["admin"]["raw"].get_canned_message_module_part3_response
                        logging.debug(f'self.cannedPluginMessagePart3:{self.cannedPluginMessagePart3}')
                        self.gotResponse = True

@@ -346,7 +389,7 @@ class Node:
            if "decoded" in p:
                if "admin" in p["decoded"]:
                    if "raw" in p["decoded"]["admin"]:
-                        self.cannedPluginMessagePart4 = p["decoded"]["admin"]["raw"].get_canned_message_plugin_part4_response
+                        self.cannedPluginMessagePart4 = p["decoded"]["admin"]["raw"].get_canned_message_module_part4_response
                        logging.debug(f'self.cannedPluginMessagePart4:{self.cannedPluginMessagePart4}')
                        self.gotResponse = True

@@ -356,28 +399,28 @@ class Node:
        if not self.cannedPluginMessage:

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

            p2 = admin_pb2.AdminMessage()
-            p2.get_canned_message_plugin_part2_request = True
+            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_plugin_part3_request = True
+            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_plugin_part4_request = True
+            p4.get_canned_message_module_part4_request = True
            self.gotResponse = False
            self._sendAdmin(p4, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart4)
            while self.gotResponse is False:
@@ -425,13 +468,13 @@ class Node:

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

            logging.debug(f"Setting canned message '{chunk}' part {i+1}")
            self._sendAdmin(p)
--- a/meshtastic/portnums_pb2.py
+++ b/meshtastic/portnums_pb2.py
@@ -19,7 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
  package='',
  syntax='proto3',
  serialized_options=b'\n\023com.geeksville.meshB\010PortnumsH\003Z!github.com/meshtastic/gomeshproto',
-  serialized_pb=b'\n\x0eportnums.proto*\xbb\x02\n\x07PortNum\x12\x0f\n\x0bUNKNOWN_APP\x10\x00\x12\x14\n\x10TEXT_MESSAGE_APP\x10\x01\x12\x17\n\x13REMOTE_HARDWARE_APP\x10\x02\x12\x10\n\x0cPOSITION_APP\x10\x03\x12\x10\n\x0cNODEINFO_APP\x10\x04\x12\x0f\n\x0bROUTING_APP\x10\x05\x12\r\n\tADMIN_APP\x10\x06\x12\r\n\tREPLY_APP\x10 \x12\x11\n\rIP_TUNNEL_APP\x10!\x12\x0e\n\nSERIAL_APP\x10@\x12\x15\n\x11STORE_FORWARD_APP\x10\x41\x12\x12\n\x0eRANGE_TEST_APP\x10\x42\x12\x11\n\rTELEMETRY_APP\x10\x43\x12\x0b\n\x07ZPS_APP\x10\x44\x12\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x12\x08\n\x03MAX\x10\xff\x03\x42\x44\n\x13\x63om.geeksville.meshB\x08PortnumsH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+  serialized_pb=b'\n\x0eportnums.proto*\xee\x02\n\x07PortNum\x12\x0f\n\x0bUNKNOWN_APP\x10\x00\x12\x14\n\x10TEXT_MESSAGE_APP\x10\x01\x12\x17\n\x13REMOTE_HARDWARE_APP\x10\x02\x12\x10\n\x0cPOSITION_APP\x10\x03\x12\x10\n\x0cNODEINFO_APP\x10\x04\x12\x0f\n\x0bROUTING_APP\x10\x05\x12\r\n\tADMIN_APP\x10\x06\x12\x1f\n\x1bTEXT_MESSAGE_COMPRESSED_APP\x10\x07\x12\x10\n\x0cWAYPOINT_APP\x10\x08\x12\r\n\tREPLY_APP\x10 \x12\x11\n\rIP_TUNNEL_APP\x10!\x12\x0e\n\nSERIAL_APP\x10@\x12\x15\n\x11STORE_FORWARD_APP\x10\x41\x12\x12\n\x0eRANGE_TEST_APP\x10\x42\x12\x11\n\rTELEMETRY_APP\x10\x43\x12\x0b\n\x07ZPS_APP\x10\x44\x12\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x12\x08\n\x03MAX\x10\xff\x03\x42\x44\n\x13\x63om.geeksville.meshB\x08PortnumsH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
 )

 _PORTNUM = _descriptor.EnumDescriptor(
@@ -57,50 +57,58 @@ _PORTNUM = _descriptor.EnumDescriptor(
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='REPLY_APP', index=7, number=32,
+      name='TEXT_MESSAGE_COMPRESSED_APP', index=7, number=7,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='IP_TUNNEL_APP', index=8, number=33,
+      name='WAYPOINT_APP', index=8, number=8,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='SERIAL_APP', index=9, number=64,
+      name='REPLY_APP', index=9, number=32,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='STORE_FORWARD_APP', index=10, number=65,
+      name='IP_TUNNEL_APP', index=10, number=33,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='RANGE_TEST_APP', index=11, number=66,
+      name='SERIAL_APP', index=11, number=64,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='TELEMETRY_APP', index=12, number=67,
+      name='STORE_FORWARD_APP', index=12, number=65,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='ZPS_APP', index=13, number=68,
+      name='RANGE_TEST_APP', index=13, number=66,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='PRIVATE_APP', index=14, number=256,
+      name='TELEMETRY_APP', index=14, number=67,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='ATAK_FORWARDER', index=15, number=257,
+      name='ZPS_APP', index=15, number=68,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='MAX', index=16, number=511,
+      name='PRIVATE_APP', index=16, number=256,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ATAK_FORWARDER', index=17, number=257,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MAX', index=18, number=511,
      serialized_options=None,
      type=None),
  ],
  containing_type=None,
  serialized_options=None,
  serialized_start=19,
-  serialized_end=334,
+  serialized_end=385,
 )
 _sym_db.RegisterEnumDescriptor(_PORTNUM)

@@ -112,6 +120,8 @@ POSITION_APP = 3
 NODEINFO_APP = 4
 ROUTING_APP = 5
 ADMIN_APP = 6
+TEXT_MESSAGE_COMPRESSED_APP = 7
+WAYPOINT_APP = 8
 REPLY_APP = 32
 IP_TUNNEL_APP = 33
 SERIAL_APP = 64
--- a/meshtastic/radioconfig_pb2.py
+++ b/meshtastic/radioconfig_pb2.py
--- a/meshtastic/serial_interface.py
+++ b/meshtastic/serial_interface.py
@@ -50,7 +50,7 @@ class SerialInterface(StreamInterface):
                f.close()
            time.sleep(0.1)

-        self.stream = serial.Serial(self.devPath, 921600, exclusive=True, timeout=0.5, write_timeout=0)
+        self.stream = serial.Serial(self.devPath, 115200, exclusive=True, timeout=0.5, write_timeout=0)
        self.stream.flush()
        time.sleep(0.1)

--- a/meshtastic/supported_device.py
+++ b/meshtastic/supported_device.py
@@ -73,14 +73,21 @@ rak4631_5005 = SupportedDevice(name="RAK 4631 5005", version="", for_firmware="r
                               device_class="nrf52",
                               baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
                               usb_vendor_id_in_hex="239a", usb_product_id_in_hex="0029")
+rak4631_5005_epaper = SupportedDevice(name="RAK 4631 5005 14000 epaper", version="", for_firmware="rak4631_5005_epaper",
+                               device_class="nrf52",
+                               baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
+                               usb_vendor_id_in_hex="239a", usb_product_id_in_hex="0029")
 # Note: The 19003 reports same product id as 5005 in boot mode
 rak4631_19003 = SupportedDevice(name="RAK 4631 19003", version="", for_firmware="rak4631_19003",
                                device_class="nrf52",
                                baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
                                usb_vendor_id_in_hex="239a", usb_product_id_in_hex="8029")
+nano_g1 = SupportedDevice(name="Nano G1", version="", for_firmware="nano-g1",
+                              baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
+                              usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")

 supported_devices = [tbeam_v0_7, tbeam_v1_1, tbeam_M8N, tbeam_M8N_SX1262,
                     tlora_v1, tlora_v1_3, tlora_v2, tlora_v2_1_1_6,
                     heltec_v1, heltec_v2_0, heltec_v2_1,
-                     meshtastic_diy_v1, techo_1, rak4631_5005, rak4631_19003,
-                     rak11200]
+                     meshtastic_diy_v1, techo_1, rak4631_5005, rak4631_5005_epaper, rak4631_19003,
+                     rak11200, nano_g1]
--- a/meshtastic/telemetry_pb2.py
+++ b/meshtastic/telemetry_pb2.py
@@ -2,6 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: telemetry.proto

+from google.protobuf.internal import enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
@@ -18,9 +19,84 @@ DESCRIPTOR = _descriptor.FileDescriptor(
  package='',
  syntax='proto3',
  serialized_options=b'\n\023com.geeksville.meshB\017TelemetryProtosH\003Z!github.com/meshtastic/gomeshproto',
-  serialized_pb=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\x07variantBK\n\x13\x63om.geeksville.meshB\x0fTelemetryProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+  serialized_pb=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'
 )

+_TELEMETRYSENSORTYPE = _descriptor.EnumDescriptor(
+  name='TelemetrySensorType',
+  full_name='TelemetrySensorType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='NotSet', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DHT11', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DS18B20', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DHT12', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DHT21', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='DHT22', index=5, number=5,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BME280', index=6, number=6,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BME680', index=7, number=7,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MCP9808', index=8, number=8,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SHTC3', index=9, number=9,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='INA260', index=10, number=10,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='INA219', index=11, number=11,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=418,
+  serialized_end=580,
+)
+_sym_db.RegisterEnumDescriptor(_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



@@ -200,6 +276,7 @@ _TELEMETRY.fields_by_name['environment_metrics'].containing_oneof = _TELEMETRY.o
 DESCRIPTOR.message_types_by_name['DeviceMetrics'] = _DEVICEMETRICS
 DESCRIPTOR.message_types_by_name['EnvironmentMetrics'] = _ENVIRONMENTMETRICS
 DESCRIPTOR.message_types_by_name['Telemetry'] = _TELEMETRY
+DESCRIPTOR.enum_types_by_name['TelemetrySensorType'] = _TELEMETRYSENSORTYPE
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)

 DeviceMetrics = _reflection.GeneratedProtocolMessageType('DeviceMetrics', (_message.Message,), {
--- a/meshtastic/tests/test_main.py
+++ b/meshtastic/tests/test_main.py
@@ -12,14 +12,14 @@ import pytest

 from meshtastic.__main__ import initParser, main, Globals, onReceive, onConnection, export_config, getPref, setPref, onNode, tunnelMain
 #from ..radioconfig_pb2 import UserPreferences
-import meshtastic.radioconfig_pb2
+import meshtastic.config_pb2
 from ..serial_interface import SerialInterface
 from ..tcp_interface import TCPInterface
 #from ..ble_interface import BLEInterface
 from ..node import Node
 from ..channel_pb2 import Channel
 from ..remote_hardware import onGPIOreceive
-from ..radioconfig_pb2 import RadioConfig
+from ..config_pb2 import Config


@pytest.mark.unit
--- a/meshtastic/tests/test_mesh_interface.py
+++ b/meshtastic/tests/test_mesh_interface.py
@@ -10,7 +10,7 @@ from ..mesh_interface import MeshInterface
 from ..node import Node
 from .. import mesh_pb2
 from ..__init__ import LOCAL_ADDR, BROADCAST_ADDR
-from ..radioconfig_pb2 import RadioConfig
+from ..config_pb2 import Config
 from ..util import Timeout


--- a/meshtastic/tests/test_node.py
+++ b/meshtastic/tests/test_node.py
@@ -10,7 +10,7 @@ from ..node import Node
 from ..serial_interface import SerialInterface
 from ..admin_pb2 import AdminMessage
 from ..channel_pb2 import Channel
-from ..radioconfig_pb2 import RadioConfig
+from ..config_pb2 import Config
 #from ..cannedmessages_pb2 import (CannedMessagePluginMessagePart1, CannedMessagePluginMessagePart2,
 #                                  CannedMessagePluginMessagePart3, CannedMessagePluginMessagePart4,
 #                                  CannedMessagePluginMessagePart5)
--- a/meshtastic/tests/test_smoke1.py
+++ b/meshtastic/tests/test_smoke1.py
@@ -170,20 +170,6 @@ def test_smoke1_port():
    assert return_value == 0


-@pytest.mark.smoke1
-def test_smoke1_set_is_router_true():
-    """Test --set is_router true"""
-    return_value, out = subprocess.getstatusoutput('meshtastic --set is_router true')
-    assert re.match(r'Connected to radio', out)
-    assert re.search(r'^Set is_router to true', out, re.MULTILINE)
-    assert return_value == 0
-    # pause for the radio
-    time.sleep(PAUSE_AFTER_COMMAND)
-    return_value, out = subprocess.getstatusoutput('meshtastic --get is_router')
-    assert re.search(r'^is_router: True', out, re.MULTILINE)
-    assert return_value == 0
-
-
@pytest.mark.smoke1
 def test_smoke1_set_location_info():
    """Test --setlat, --setlon and --setalt """
@@ -202,20 +188,6 @@ def test_smoke1_set_location_info():
    assert return_value == 0


-@pytest.mark.smoke1
-def test_smoke1_set_is_router_false():
-    """Test --set is_router false"""
-    return_value, out = subprocess.getstatusoutput('meshtastic --set is_router false')
-    assert re.match(r'Connected to radio', out)
-    assert re.search(r'^Set is_router to false', out, re.MULTILINE)
-    assert return_value == 0
-    # pause for the radio
-    time.sleep(PAUSE_AFTER_COMMAND)
-    return_value, out = subprocess.getstatusoutput('meshtastic --get is_router')
-    assert re.search(r'^is_router: False', out, re.MULTILINE)
-    assert return_value == 0
-
-
@pytest.mark.smoke1
 def test_smoke1_set_owner():
    """Test --set-owner name"""
@@ -262,19 +234,43 @@ def test_smoke1_set_team():
    assert return_value == 0


+@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')
+    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 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')
+    assert re.match(r'Connected to radio', out)
+    assert re.search(r'^Set modem_config to MidFast', 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 return_value == 0
+
+
@pytest.mark.smoke1
 def test_smoke1_ch_values():
-    """Test --ch-longslow, --ch-longfast, --ch-mediumslow, --ch-mediumsfast,
+    """Test --ch-vlongslow --ch-longslow, --ch-longfast, --ch-mediumslow, --ch-mediumsfast,
       --ch-shortslow, and --ch-shortfast arguments
    """
    exp = {
-            '--ch-longslow': 'Bw125Cr48Sf4096',
-            '--ch-longfast': 'Bw31_25Cr48Sf512',
-            '--ch-mediumslow': 'Bw250Cr46Sf2048',
-            '--ch-mediumfast': 'Bw250Cr47Sf1024',
-            # for some reason, this value does not show any modemConfig
-            '--ch-shortslow': '{ "psk',
-            '--ch-shortfast': 'Bw500Cr45Sf128'
+            '--ch-vlongslow': '{ "psk": "AQ==" }',
+            '--ch-longslow': 'LongSlow',
+            '--ch-longfast': 'LongFast',
+            '--ch-midslow': 'MidSlow',
+            '--ch-midfast': 'MidFast',
+            '--ch-shortslow': 'ShortSlow',
+            '--ch-shortfast': 'ShortFast'
          }

    for key, val in exp.items():
@@ -578,30 +574,6 @@ def test_smoke1_ensure_ch_del_third_of_three_channels():
    time.sleep(PAUSE_AFTER_COMMAND)


-@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 Bw31_25Cr48Sf512')
-    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'Bw31_25Cr48Sf512', 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 Bw31_25Cr48Sf512 --ch-index 0')
-    assert re.match(r'Connected to radio', out)
-    assert re.search(r'^Set modem_config to Bw31_25Cr48Sf512', out, re.MULTILINE)
-    assert return_value == 0
-    # pause for the radio
-    time.sleep(PAUSE_AFTER_COMMAND)
-    return_value, out = subprocess.getstatusoutput('meshtastic --info')
-    assert re.search(r'Bw31_25Cr48Sf512', out, re.MULTILINE)
-    assert return_value == 0
-
-
@pytest.mark.smoke1
 def test_smoke1_seturl_default():
    """Test --seturl with default value"""
@@ -650,7 +622,6 @@ def test_smoke1_configure():
    assert re.search('^Setting device position', out, re.MULTILINE)
    assert re.search('^Set region to 1', out, re.MULTILINE)
    assert re.search('^Set is_always_powered to true', out, re.MULTILINE)
-    assert re.search('^Set send_owner_interval to 2', out, re.MULTILINE)
    assert re.search('^Set screen_on_secs to 31536000', out, re.MULTILINE)
    assert re.search('^Set wait_bluetooth_secs to 31536000', out, re.MULTILINE)
    assert re.search('^Writing modified preferences to device', out, re.MULTILINE)
--- a/meshtastic/tests/test_smokevirt.py
+++ b/meshtastic/tests/test_smokevirt.py
@@ -175,20 +175,6 @@ def test_smokevirt_port():
    assert len(ports) == 0


-@pytest.mark.smokevirt
-def test_smokevirt_set_is_router_true():
-    """Test --set is_router true"""
-    return_value, out = subprocess.getstatusoutput('meshtastic --host localhost --set is_router true')
-    assert re.match(r'Connected to radio', out)
-    assert re.search(r'^Set is_router to true', out, re.MULTILINE)
-    assert return_value == 0
-    # pause for the radio
-    time.sleep(PAUSE_AFTER_COMMAND)
-    return_value, out = subprocess.getstatusoutput('meshtastic --host localhost --get is_router')
-    assert re.search(r'^is_router: True', out, re.MULTILINE)
-    assert return_value == 0
-
-
@pytest.mark.smokevirt
 def test_smokevirt_set_location_info():
    """Test --setlat, --setlon and --setalt """
@@ -207,20 +193,6 @@ def test_smokevirt_set_location_info():
    assert return_value == 0


-@pytest.mark.smokevirt
-def test_smokevirt_set_is_router_false():
-    """Test --set is_router false"""
-    return_value, out = subprocess.getstatusoutput('meshtastic --host localhost --set is_router false')
-    assert re.match(r'Connected to radio', out)
-    assert re.search(r'^Set is_router to false', out, re.MULTILINE)
-    assert return_value == 0
-    # pause for the radio
-    time.sleep(PAUSE_AFTER_COMMAND)
-    return_value, out = subprocess.getstatusoutput('meshtastic --host localhost --get is_router')
-    assert re.search(r'^is_router: False', out, re.MULTILINE)
-    assert return_value == 0
-
-
@pytest.mark.smokevirt
 def test_smokevirt_set_owner():
    """Test --set-owner name"""
@@ -273,12 +245,12 @@ def test_smokevirt_ch_values():
       --ch-shortslow, and --ch-shortfast arguments
    """
    exp = {
-            '--ch-longslow': 'Bw125Cr48Sf4096',
-            '--ch-longfast': 'Bw31_25Cr48Sf512',
-            '--ch-mediumslow': 'Bw250Cr46Sf2048',
-            '--ch-mediumfast': 'Bw250Cr47Sf1024',
-            '--ch-shortslow': '{ "psk',
-            '--ch-shortfast': 'Bw500Cr45Sf128'
+            '--ch-longslow': 'LongSlow',
+            '--ch-longfast': 'LongFast',
+            '--ch-midslow': 'MidSlow',
+            '--ch-midfast': 'MidFast',
+            '--ch-shortslow': 'ShortSlow',
+            '--ch-shortfast': 'ShortFast'
          }

    for key, val in exp.items():
@@ -611,14 +583,14 @@ def test_smokevirt_ch_set_modem_config():
    assert return_value == 0
    # pause for the radio
    time.sleep(PAUSE_AFTER_COMMAND)
-    return_value, out = subprocess.getstatusoutput('meshtastic --host localhost --ch-set modem_config Bw31_25Cr48Sf512 --ch-index 0')
+    return_value, out = subprocess.getstatusoutput('meshtastic --host localhost --ch-set modem_config MidSlow --ch-index 0')
    assert re.match(r'Connected to radio', out)
-    assert re.search(r'^Set modem_config to Bw31_25Cr48Sf512', out, re.MULTILINE)
+    assert re.search(r'^Set modem_config to MidSlow', out, re.MULTILINE)
    assert return_value == 0
    # pause for the radio
    time.sleep(PAUSE_AFTER_COMMAND)
    return_value, out = subprocess.getstatusoutput('meshtastic --host localhost --info')
-    assert re.search(r'Bw31_25Cr48Sf512', out, re.MULTILINE)
+    assert re.search(r'MidSlow', out, re.MULTILINE)
    assert return_value == 0


--- a/meshtastic/util.py
+++ b/meshtastic/util.py
@@ -266,7 +266,7 @@ def camel_to_snake(a_string):


 def detect_supported_devices():
-    """detect supported devices"""
+    """detect supported devices based on vendor id"""
    system = platform.system()
    #print(f'system:{system}')

@@ -285,19 +285,8 @@ def detect_supported_devices():
            if re.search(search, lsusb_output, re.MULTILINE):
                #print(f'Found vendor id that matches')
                devices = get_devices_with_vendor_id(vid)
-                # check device id
                for device in devices:
-                    #print(f'device:{device} device.usb_product_id_in_hex:{device.usb_product_id_in_hex}')
-                    if device.usb_product_id_in_hex:
-                        search = f' {vid}:{device.usb_product_id_in_hex} '
-                        #print(f'search:"{search}"')
-                        if re.search(search, lsusb_output, re.MULTILINE):
-                            # concatenate the devices with vendor id to possibles
-                            possible_devices.add(device)
-                    else:
-                        # if there is a supported device witout a product id, then it
-                        # might be a match... so, concatenate
-                        possible_devices.add(device)
+                    possible_devices.add(device)

    elif system == "Windows":
        # if windows, run Get-PnpDevice
@@ -313,22 +302,8 @@ def detect_supported_devices():
            if re.search(search, sp_output, re.MULTILINE):
                #print(f'Found vendor id that matches')
                devices = get_devices_with_vendor_id(vid)
-                # check device id
                for device in devices:
-                    #print(f'device:{device} device.usb_product_id_in_hex:{device.usb_product_id_in_hex}')
-                    if device.usb_product_id_in_hex:
-                        search = f'DeviceID.*{vid.upper()}&PID_{device.usb_product_id_in_hex.upper()}'
-                        #print(f'search:"{search}"')
-                        if re.search(search, sp_output, re.MULTILINE):
-                            # concatenate the devices with vendor id to possibles
-                            possible_devices.add(device)
-                        # do a check to see if there is a Windows driver issue
-                        if detect_windows_needs_driver(device, False):
-                            print("WARNING: Need to install driver.")
-                    else:
-                        # if there is a supported device witout a product id, then it
-                        # might be a match... so, concatenate
-                        possible_devices.add(device)
+                    possible_devices.add(device)

    elif system == "Darwin":
        # run: system_profiler SPUSBDataType
@@ -343,19 +318,8 @@ def detect_supported_devices():
            if re.search(search, sp_output, re.MULTILINE):
                #print(f'Found vendor id that matches')
                devices = get_devices_with_vendor_id(vid)
-                # check device id
                for device in devices:
-                    #print(f'device:{device} device.usb_product_id_in_hex:{device.usb_product_id_in_hex}')
-                    if device.usb_product_id_in_hex:
-                        search = f'Product ID: 0x{device.usb_product_id_in_hex}'
-                        #print(f'search:"{search}"')
-                        if re.search(search, sp_output, re.MULTILINE):
-                            # concatenate the devices with vendor id to possibles
-                            possible_devices.add(device)
-                    else:
-                        # if there is a supported device witout a product id, then it
-                        # might be a match... so, concatenate
-                        possible_devices.add(device)
+                    possible_devices.add(device)
    return possible_devices


--- 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.8",
+    version="1.3alpha.16",
    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	b79b7ceb40	Correct config	2022-06-16 20:31:14 -05:00
Ben Meadors	2a546f8899	Merge master	2022-06-16 16:57:31 -05:00
Ben Meadors	a4a0740903	Regen protos	2022-06-16 16:57:05 -05:00
Ben Meadors	075ad01e46	Merge pull request #336 from meshtastic/change-default-baud Changed baud to 115200	2022-06-15 11:46:31 -05:00
Ben Meadors	1296a1ce28	Changed baud to 115200	2022-06-15 10:58:55 -05:00
Thomas Göttgens	d510ba15c5	Trunk Protos	2022-06-09 12:20:13 +02:00
Jm Casler	decc887cb5	updating proto submodule to latest	2022-05-21 17:10:27 -07:00
Ben Meadors	d15667d5ce	Regened new protos	2022-05-19 07:24:39 -05:00
Sacha Weatherstone	39a7869524	Update README.md	2022-05-12 21:52:04 +10:00
Sacha Weatherstone	c9464d2595	Update README.md	2022-05-12 21:28:38 +10:00
Sacha Weatherstone	717de611b9	Update ci.yml	2022-05-12 21:28:09 +10:00
Jm Casler	85869cf595	updating proto submodule to latest	2022-05-01 18:33:44 -07:00
Jm Casler	03ca28e0d2	updating proto submodule to latest	2022-05-01 08:42:04 -07:00
github-actions	a3bdf976bb	bump version	2022-04-27 18:40:29 +00:00
mkinney	bf6eec626c	Merge pull request #328 from mkinney/master add nano_g1	2022-04-27 11:35:44 -07:00
Mike Kinney	cd0bdbbd9c	add nano_g1	2022-04-27 11:29:05 -07:00
github-actions	e7faa85476	bump version	2022-04-27 12:33:09 +00:00
Ben Meadors	e419f95910	Merge pull request #327 from meshtastic/device-updates-release Updated protos	2022-04-27 07:21:56 -05:00
Ben Meadors	ee613104f1	Updated protos	2022-04-27 07:19:08 -05:00
github-actions	93a8722b22	bump version	2022-04-25 07:20:32 +00:00
Thomas Göttgens	73b06248aa	Update __init__.py Device firmware requires 20300 now - change coming from android.	2022-04-25 09:15:33 +02:00
Jm Casler	82169f9d58	updating proto submodule to latest	2022-04-20 18:01:40 -07:00
github-actions	1fa71f2e2d	bump version	2022-04-18 23:38:33 +00:00
mkinney	af599ab320	Merge pull request #326 from mkinney/master update protos	2022-04-18 16:37:41 -07:00
Mike Kinney	99eed4bb5c	remove send_owner_interval	2022-04-18 16:35:06 -07:00
Jm Casler	d8deb90527	updating proto submodule to latest	2022-04-18 12:29:23 -07:00
Mike Kinney	37a0010714	Merge remote-tracking branch 'upstream/master'	2022-04-18 11:53:16 -07:00
Mike Kinney	3c298df5ce	update protos	2022-04-18 11:49:43 -07:00
Jm Casler	c6a8618d33	updating proto submodule to latest	2022-04-15 22:30:23 -07:00
Jm Casler	f19ddf66b8	updating proto submodule to latest	2022-04-12 21:10:46 -07:00
github-actions	203d5246eb	bump version	2022-04-11 21:27:30 +00:00
mkinney	b78276e49a	Merge pull request #323 from mkinney/master fix smoke1 tests; regen protobufs	2022-04-11 14:26:00 -07:00
Mike Kinney	bd4d309d89	update codecov	2022-04-11 14:23:49 -07:00
Mike Kinney	804c09b6c5	bump to v2 of codecov	2022-04-11 14:18:38 -07:00
Mike Kinney	92202807f7	update/regen protobufs	2022-04-11 14:07:04 -07:00
Mike Kinney	0c92460163	got smoke1 tests to pass	2022-04-11 13:58:56 -07:00
Mike Kinney	8bb570d222	fix smoke1 tests	2022-04-11 13:17:39 -07:00
mkinney	f1abce9eff	Merge pull request #322 from amerinoj/master fixed set and get canned message	2022-04-11 12:48:50 -07:00
chst	1fc46a3c02	fixed set and get canned message replacement the entries "get canned_message plugin" to get_canned_message_module_" in node.py	2022-04-10 19:21:57 +02:00
Jm Casler	1d45adfb27	Update README.md	2022-04-07 16:31:27 -07:00
mkinney	8365ad5d1b	Merge pull request #316 from mkinney/master fix tests for 1.3	2022-03-31 14:22:41 -07:00
Mike Kinney	00346ea441	fix tests for 1.3	2022-03-31 14:18:53 -07:00
github-actions	ae70d34dd6	bump version	2022-03-31 17:29:03 +00:00
mkinney	e0ef62d1b3	Merge pull request #315 from mkinney/master detect devices only using vendor id	2022-03-31 10:28:04 -07:00
Mike Kinney	02e8467fdd	detect devices only using vendor id	2022-03-31 10:24:17 -07:00
github-actions	48e7f8c755	bump version	2022-03-30 21:00:08 +00:00
mkinney	19b607b3f2	Merge pull request #314 from mkinney/master add epaper; fix product id on 5005/4631	2022-03-30 13:59:15 -07:00
Mike Kinney	1d827ab2bf	add epaper; fix product id on 5005/4631	2022-03-30 13:56:19 -07:00
github-actions	7af886cf07	bump version	2022-03-30 18:48:11 +00:00