Merge pull request #304 from mkinney/1.2-legacy

fix some tlora entries
2025-12-25 17:07:53 -05:00 · 2022-03-15 19:33:47 -07:00 · 2022-03-15 19:32:27 -07:00 · 2022-03-08 18:57:44 +00:00 · 2022-03-08 10:38:37 -08:00 · 2022-03-08 10:37:15 -08:00
30 changed files with 803 additions and 1117 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,14 +42,14 @@ jobs:
        run: |
          pytest --cov=meshtastic --cov-report=xml
      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v1
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./coverage.xml
+          file: ./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,environmental_measurement_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



--- a/4
+++ b/4
@@ -6,10 +6,6 @@ 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
@@ -4,7 +4,6 @@
 ![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)
-[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/Meshtastic-python)](https://cla-assistant.io/meshtastic/Meshtastic-python)

 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.

--- a/bin/regen-protos.sh
+++ b/bin/regen-protos.sh
@@ -1,6 +1,6 @@
 #!/bin/bash

-./nanopb-0.4.5/generator-bin/protoc -I=proto --python_out meshtastic `ls proto/*.proto`
+./nanopb-0.4.4/generator-bin/protoc -I=proto --python_out meshtastic `ls proto/*.proto`

 # workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628

--- a/exampleConfig.yaml
+++ b/exampleConfig.yaml
@@ -12,5 +12,6 @@ location:
 userPrefs:
  region: 1
  isAlwaysPowered: 'true'
+  sendOwnerInterval: 2
  screenOnSecs: 31536000
  waitBluetoothSecs: 31536000
--- a/example_config.yaml
+++ b/example_config.yaml
@@ -12,6 +12,7 @@ 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/examples/tcp_gps_example.py
+++ b/examples/tcp_gps_example.py
@@ -1,14 +0,0 @@
-"""Demonstration of how to look up a radio's location via its LAN connection.
-   Before running, connect your machine to the same WiFi network as the radio.
-"""
-
-import meshtastic
-import meshtastic.tcp_interface
-
-radio_hostname = "meshtastic.local"  # Can also be an IP
-iface = meshtastic.tcp_interface.TCPInterface(radio_hostname)
-my_node_num = iface.myInfo.my_node_num
-pos = iface.nodesByNum[my_node_num]["position"]
-print (pos)
-
-iface.close()
--- a/meshtastic/init.py
+++ b/meshtastic/init.py
@@ -79,7 +79,7 @@ from google.protobuf.json_format import MessageToJson
 from meshtastic.util import fixme, catchAndIgnore, stripnl, DeferredExecution, Timeout
 from meshtastic.node import Node
 from meshtastic import (mesh_pb2, portnums_pb2, apponly_pb2, admin_pb2,
-                        telemetry_pb2, remote_hardware_pb2,
+                        environmental_measurement_pb2, remote_hardware_pb2,
                        channel_pb2, radioconfig_pb2, util)


@@ -181,6 +181,7 @@ protocols = {
    portnums_pb2.PortNum.NODEINFO_APP: KnownProtocol("user", mesh_pb2.User, _onNodeInfoReceive),
    portnums_pb2.PortNum.ADMIN_APP: KnownProtocol("admin", admin_pb2.AdminMessage),
    portnums_pb2.PortNum.ROUTING_APP: KnownProtocol("routing", mesh_pb2.Routing),
-    portnums_pb2.PortNum.TELEMETRY_APP: KnownProtocol("telemetry", telemetry_pb2.Telemetry),
-    portnums_pb2.PortNum.REMOTE_HARDWARE_APP: KnownProtocol("remotehw", remote_hardware_pb2.HardwareMessage)
+    portnums_pb2.PortNum.ENVIRONMENTAL_MEASUREMENT_APP: KnownProtocol("environmental", environmental_measurement_pb2.EnvironmentalMeasurement),
+    portnums_pb2.PortNum.REMOTE_HARDWARE_APP: KnownProtocol(
+        "remotehw", remote_hardware_pb2.HardwareMessage)
 }
--- a/meshtastic/main.py
+++ b/meshtastic/main.py
@@ -119,10 +119,6 @@ def setPref(attributes, name, valStr):
    val = meshtastic.util.fromStr(valStr)
    logging.debug(f'valStr:{valStr} val:{val}')

-    if snake_name == 'wifi_password' and len(valStr) < 8:
-        print(f"Warning: wifi_password must be 8 or more characters.")
-        return
-
    enumType = field.enum_type
    # pylint: disable=C0123
    if enumType and type(val) == str:
@@ -143,22 +139,11 @@ def setPref(attributes, name, valStr):
            for temp_name in sorted(names):
                print(f"    {temp_name}")
            return
-
-    # note: 'ignore_incoming' is a repeating field
-    if snake_name != 'ignore_incoming':
-        try:
-            setattr(attributes, snake_name, val)
-        except TypeError:
-            # The setter didn't like our arg type guess try again as a string
-            setattr(attributes, snake_name, valStr)
-    else:
-        if val == 0:
-            # clear values
-            print("Clearing ignore_incoming list")
-            del attributes.ignore_incoming[:]
-        else:
-            print(f"Adding '{val}' to the ignore_incoming list")
-            attributes.ignore_incoming.extend([val])
+    try:
+        setattr(attributes, snake_name, val)
+    except TypeError:
+        # The setter didn't like our arg type guess try again as a string
+        setattr(attributes, snake_name, valStr)

    if Globals.getInstance().get_camel_case():
        print(f"Set {camel_name} to {valStr}")
@@ -454,8 +439,8 @@ def onConnected(interface):
                    print(f"Deleting channel {channelIndex}")
                    ch = interface.getNode(args.dest).deleteChannel(channelIndex)

-        ch_changes = [args.ch_vlongslow, args.ch_longslow, args.ch_longfast,
-                      args.ch_midslow, args.ch_midfast,
+        ch_changes = [args.ch_longslow, args.ch_longfast,
+                      args.ch_mediumslow, args.ch_mediumfast,
                      args.ch_shortslow, args.ch_shortfast]
        any_primary_channel_changes = any(x for x in ch_changes)
        if args.ch_set or any_primary_channel_changes or args.ch_enable or args.ch_disable:
@@ -496,26 +481,23 @@ def onConnected(interface):
                    ch.settings.CopyFrom(chs)

                # handle the simple channel set commands
-                if args.ch_vlongslow:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.VLongSlow)
-
                if args.ch_longslow:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.LongSlow)
+                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.Bw125Cr48Sf4096)

                if args.ch_longfast:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.LongFast)
+                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.Bw31_25Cr48Sf512)

-                if args.ch_midslow:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.MidSlow)
+                if args.ch_mediumslow:
+                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.Bw250Cr46Sf2048)

-                if args.ch_midfast:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.MidFast)
+                if args.ch_mediumfast:
+                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.Bw250Cr47Sf1024)

                if args.ch_shortslow:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.ShortSlow)
+                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.Bw125Cr45Sf128)

                if args.ch_shortfast:
-                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.ShortFast)
+                    setSimpleChannel(channel_pb2.ChannelSettings.ModemConfig.Bw500Cr45Sf128)

            # Handle the channel settings
            for pref in (args.ch_set or []):
@@ -819,9 +801,6 @@ def initParser():
                          "own key: '--ch-set psk 0x1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b --ch-index 0'."),
                          nargs=2, action='append')

-    parser.add_argument(
-        "--ch-vlongslow", help="Change to the very long-range and slow channel", action='store_true')
-
    parser.add_argument(
        "--ch-longslow", help="Change to the long-range and slow channel", action='store_true')

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

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

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

    parser.add_argument(
        "--ch-shortslow", help="Change to the short-range and slow channel", action='store_true')
--- a/meshtastic/admin_pb2.py
+++ b/meshtastic/admin_pb2.py
@@ -21,7 +21,7 @@ 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\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_plugin_part1_request\x18$ \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part1_response\x18% \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part2_request\x18& \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part2_response\x18\' \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part3_request\x18( \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part3_response\x18) \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part4_request\x18* \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part4_response\x18+ \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part1\x18, \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part2\x18- \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part3\x18. \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_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'
  ,
  dependencies=[channel__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,radioconfig__pb2.DESCRIPTOR,])

@@ -127,84 +127,84 @@ _ADMINMESSAGE = _descriptor.Descriptor(
      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_plugin_part1_request', full_name='AdminMessage.get_canned_message_plugin_part1_request', index=13,
      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_plugin_part1_response', full_name='AdminMessage.get_canned_message_plugin_part1_response', index=14,
      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_plugin_part2_request', full_name='AdminMessage.get_canned_message_plugin_part2_request', index=15,
      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_plugin_part2_response', full_name='AdminMessage.get_canned_message_plugin_part2_response', index=16,
      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_plugin_part3_request', full_name='AdminMessage.get_canned_message_plugin_part3_request', index=17,
      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_plugin_part3_response', full_name='AdminMessage.get_canned_message_plugin_part3_response', index=18,
      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_plugin_part4_request', full_name='AdminMessage.get_canned_message_plugin_part4_request', index=19,
      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_plugin_part4_response', full_name='AdminMessage.get_canned_message_plugin_part4_response', index=20,
      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_plugin_part1', full_name='AdminMessage.set_canned_message_plugin_part1', index=21,
      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_plugin_part2', full_name='AdminMessage.set_canned_message_plugin_part2', index=22,
      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_plugin_part3', full_name='AdminMessage.set_canned_message_plugin_part3', index=23,
      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_plugin_part4', full_name='AdminMessage.set_canned_message_plugin_part4', index=24,
      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,
@@ -282,41 +282,41 @@ _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
  _ADMINMESSAGE.fields_by_name['reboot_seconds'])
 _ADMINMESSAGE.fields_by_name['reboot_seconds'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['get_canned_message_module_part1_request'])
-_ADMINMESSAGE.fields_by_name['get_canned_message_module_part1_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_request'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['get_canned_message_module_part1_response'])
-_ADMINMESSAGE.fields_by_name['get_canned_message_module_part1_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_response'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['get_canned_message_module_part2_request'])
-_ADMINMESSAGE.fields_by_name['get_canned_message_module_part2_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_request'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['get_canned_message_module_part2_response'])
-_ADMINMESSAGE.fields_by_name['get_canned_message_module_part2_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_response'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['get_canned_message_module_part3_request'])
-_ADMINMESSAGE.fields_by_name['get_canned_message_module_part3_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_request'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['get_canned_message_module_part3_response'])
-_ADMINMESSAGE.fields_by_name['get_canned_message_module_part3_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_response'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['get_canned_message_module_part4_request'])
-_ADMINMESSAGE.fields_by_name['get_canned_message_module_part4_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_request'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['get_canned_message_module_part4_response'])
-_ADMINMESSAGE.fields_by_name['get_canned_message_module_part4_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_response'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['set_canned_message_module_part1'])
-_ADMINMESSAGE.fields_by_name['set_canned_message_module_part1'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part1'])
+_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part1'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['set_canned_message_module_part2'])
-_ADMINMESSAGE.fields_by_name['set_canned_message_module_part2'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part2'])
+_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part2'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['set_canned_message_module_part3'])
-_ADMINMESSAGE.fields_by_name['set_canned_message_module_part3'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part3'])
+_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part3'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
-  _ADMINMESSAGE.fields_by_name['set_canned_message_module_part4'])
-_ADMINMESSAGE.fields_by_name['set_canned_message_module_part4'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+  _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part4'])
+_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part4'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
 _ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
  _ADMINMESSAGE.fields_by_name['shutdown_seconds'])
 _ADMINMESSAGE.fields_by_name['shutdown_seconds'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
--- a/meshtastic/cannedmessages_pb2.py
+++ b/meshtastic/cannedmessages_pb2.py
@@ -18,42 +18,42 @@ DESCRIPTOR = _descriptor.FileDescriptor(
  package='',
  syntax='proto3',
  serialized_options=b'\n\023com.geeksville.meshB\031CannedMessageConfigProtosH\003Z!github.com/meshtastic/gomeshproto',
-  serialized_pb=b'\n\x14\x63\x61nnedmessages.proto\"w\n\x19\x43\x61nnedMessageModuleConfig\x12\x15\n\rmessagesPart1\x18\x0b \x01(\t\x12\x15\n\rmessagesPart2\x18\x0c \x01(\t\x12\x15\n\rmessagesPart3\x18\r \x01(\t\x12\x15\n\rmessagesPart4\x18\x0e \x01(\tBU\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+  serialized_pb=b'\n\x14\x63\x61nnedmessages.proto\"w\n\x19\x43\x61nnedMessagePluginConfig\x12\x15\n\rmessagesPart1\x18\x0b \x01(\t\x12\x15\n\rmessagesPart2\x18\x0c \x01(\t\x12\x15\n\rmessagesPart3\x18\r \x01(\t\x12\x15\n\rmessagesPart4\x18\x0e \x01(\tBU\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
 )




-_CANNEDMESSAGEMODULECONFIG = _descriptor.Descriptor(
-  name='CannedMessageModuleConfig',
-  full_name='CannedMessageModuleConfig',
+_CANNEDMESSAGEPLUGINCONFIG = _descriptor.Descriptor(
+  name='CannedMessagePluginConfig',
+  full_name='CannedMessagePluginConfig',
  filename=None,
  file=DESCRIPTOR,
  containing_type=None,
  fields=[
    _descriptor.FieldDescriptor(
-      name='messagesPart1', full_name='CannedMessageModuleConfig.messagesPart1', index=0,
+      name='messagesPart1', full_name='CannedMessagePluginConfig.messagesPart1', index=0,
      number=11, 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='messagesPart2', full_name='CannedMessageModuleConfig.messagesPart2', index=1,
+      name='messagesPart2', full_name='CannedMessagePluginConfig.messagesPart2', index=1,
      number=12, 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='messagesPart3', full_name='CannedMessageModuleConfig.messagesPart3', index=2,
+      name='messagesPart3', full_name='CannedMessagePluginConfig.messagesPart3', index=2,
      number=13, 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='messagesPart4', full_name='CannedMessageModuleConfig.messagesPart4', index=3,
+      name='messagesPart4', full_name='CannedMessagePluginConfig.messagesPart4', index=3,
      number=14, 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,
@@ -75,15 +75,15 @@ _CANNEDMESSAGEMODULECONFIG = _descriptor.Descriptor(
  serialized_end=143,
 )

-DESCRIPTOR.message_types_by_name['CannedMessageModuleConfig'] = _CANNEDMESSAGEMODULECONFIG
+DESCRIPTOR.message_types_by_name['CannedMessagePluginConfig'] = _CANNEDMESSAGEPLUGINCONFIG
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)

-CannedMessageModuleConfig = _reflection.GeneratedProtocolMessageType('CannedMessageModuleConfig', (_message.Message,), {
-  'DESCRIPTOR' : _CANNEDMESSAGEMODULECONFIG,
+CannedMessagePluginConfig = _reflection.GeneratedProtocolMessageType('CannedMessagePluginConfig', (_message.Message,), {
+  'DESCRIPTOR' : _CANNEDMESSAGEPLUGINCONFIG,
  '__module__' : 'cannedmessages_pb2'
-  # @@protoc_insertion_point(class_scope:CannedMessageModuleConfig)
+  # @@protoc_insertion_point(class_scope:CannedMessagePluginConfig)
  })
-_sym_db.RegisterMessage(CannedMessageModuleConfig)
+_sym_db.RegisterMessage(CannedMessagePluginConfig)


 DESCRIPTOR._options = None
--- a/meshtastic/channel_pb2.py
+++ b/meshtastic/channel_pb2.py
@@ -18,7 +18,7 @@ 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\"\x91\x03\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\"\x8a\x01\n\x0bModemConfig\x12\x12\n\x0e\x42w125Cr45Sf128\x10\x00\x12\x12\n\x0e\x42w500Cr45Sf128\x10\x01\x12\x14\n\x10\x42w31_25Cr48Sf512\x10\x02\x12\x13\n\x0f\x42w125Cr48Sf4096\x10\x03\x12\x13\n\x0f\x42w250Cr46Sf2048\x10\x04\x12\x13\n\x0f\x42w250Cr47Sf1024\x10\x05\"\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'
 )


@@ -30,38 +30,34 @@ _CHANNELSETTINGS_MODEMCONFIG = _descriptor.EnumDescriptor(
  file=DESCRIPTOR,
  values=[
    _descriptor.EnumValueDescriptor(
-      name='VLongSlow', index=0, number=0,
+      name='Bw125Cr45Sf128', index=0, number=0,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='LongSlow', index=1, number=1,
+      name='Bw500Cr45Sf128', index=1, number=1,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='LongFast', index=2, number=2,
+      name='Bw31_25Cr48Sf512', index=2, number=2,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='MidSlow', index=3, number=3,
+      name='Bw125Cr48Sf4096', index=3, number=3,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='MidFast', index=4, number=4,
+      name='Bw250Cr46Sf2048', 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,
+      name='Bw250Cr47Sf1024', index=5, number=5,
      serialized_options=None,
      type=None),
  ],
  containing_type=None,
  serialized_options=None,
-  serialized_start=280,
-  serialized_end=392,
+  serialized_start=281,
+  serialized_end=419,
 )
 _sym_db.RegisterEnumDescriptor(_CHANNELSETTINGS_MODEMCONFIG)

@@ -86,8 +82,8 @@ _CHANNEL_ROLE = _descriptor.EnumDescriptor(
  ],
  containing_type=None,
  serialized_options=None,
-  serialized_start=486,
-  serialized_end=534,
+  serialized_start=513,
+  serialized_end=561,
 )
 _sym_db.RegisterEnumDescriptor(_CHANNEL_ROLE)

@@ -190,7 +186,7 @@ _CHANNELSETTINGS = _descriptor.Descriptor(
  oneofs=[
  ],
  serialized_start=18,
-  serialized_end=392,
+  serialized_end=419,
 )


@@ -235,8 +231,8 @@ _CHANNEL = _descriptor.Descriptor(
  extension_ranges=[],
  oneofs=[
  ],
-  serialized_start=395,
-  serialized_end=534,
+  serialized_start=422,
+  serialized_end=561,
 )

 _CHANNELSETTINGS.fields_by_name['modem_config'].enum_type = _CHANNELSETTINGS_MODEMCONFIG
--- a/meshtastic/deviceonly_pb2.py
+++ b/meshtastic/deviceonly_pb2.py
@@ -2,7 +2,6 @@
 # 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
@@ -14,6 +13,7 @@ _sym_db = _symbol_database.Default()

 from . import channel_pb2 as channel__pb2
 from . import mesh_pb2 as mesh__pb2
+from . import radioconfig_pb2 as radioconfig__pb2


 DESCRIPTOR = _descriptor.FileDescriptor(
@@ -21,41 +21,72 @@ 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.Channel\"\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'
+  serialized_pb=b'\n\x10\x64\x65viceonly.proto\x1a\rchannel.proto\x1a\nmesh.proto\x1a\x11radioconfig.proto\"\x80\x01\n\x11LegacyRadioConfig\x12\x39\n\x0bpreferences\x18\x01 \x01(\x0b\x32$.LegacyRadioConfig.LegacyPreferences\x1a\x30\n\x11LegacyPreferences\x12\x1b\n\x06region\x18\x0f \x01(\x0e\x32\x0b.RegionCode\"\x8f\x02\n\x0b\x44\x65viceState\x12\'\n\x0blegacyRadio\x18\x01 \x01(\x0b\x32\x12.LegacyRadioConfig\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'
  ,
-  dependencies=[channel__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,])
+  dependencies=[channel__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,radioconfig__pb2.DESCRIPTOR,])

-_SCREENFONTS = _descriptor.EnumDescriptor(
-  name='ScreenFonts',
-  full_name='ScreenFonts',
+
+
+
+_LEGACYRADIOCONFIG_LEGACYPREFERENCES = _descriptor.Descriptor(
+  name='LegacyPreferences',
+  full_name='LegacyRadioConfig.LegacyPreferences',
  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,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='region', full_name='LegacyRadioConfig.LegacyPreferences.region', index=0,
+      number=15, 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=[
+  ],
  serialized_options=None,
-  serialized_start=458,
-  serialized_end=520,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=147,
+  serialized_end=195,
 )
-_sym_db.RegisterEnumDescriptor(_SCREENFONTS)
-
-ScreenFonts = enum_type_wrapper.EnumTypeWrapper(_SCREENFONTS)
-FONT_SMALL = 0
-FONT_MEDIUM = 1
-FONT_LARGE = 2

+_LEGACYRADIOCONFIG = _descriptor.Descriptor(
+  name='LegacyRadioConfig',
+  full_name='LegacyRadioConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='preferences', full_name='LegacyRadioConfig.preferences', 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),
+  ],
+  extensions=[
+  ],
+  nested_types=[_LEGACYRADIOCONFIG_LEGACYPREFERENCES, ],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=67,
+  serialized_end=195,
+)


 _DEVICESTATE = _descriptor.Descriptor(
@@ -66,56 +97,63 @@ _DEVICESTATE = _descriptor.Descriptor(
  containing_type=None,
  fields=[
    _descriptor.FieldDescriptor(
-      name='my_node', full_name='DeviceState.my_node', index=0,
+      name='legacyRadio', full_name='DeviceState.legacyRadio', 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='my_node', full_name='DeviceState.my_node', 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='owner', full_name='DeviceState.owner', index=1,
+      name='owner', full_name='DeviceState.owner', 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='node_db', full_name='DeviceState.node_db', index=2,
+      name='node_db', full_name='DeviceState.node_db', index=3,
      number=4, type=11, cpp_type=10, 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),
    _descriptor.FieldDescriptor(
-      name='receive_queue', full_name='DeviceState.receive_queue', index=3,
+      name='receive_queue', full_name='DeviceState.receive_queue', index=4,
      number=5, type=11, cpp_type=10, 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),
    _descriptor.FieldDescriptor(
-      name='version', full_name='DeviceState.version', index=4,
+      name='version', full_name='DeviceState.version', index=5,
      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='rx_text_message', full_name='DeviceState.rx_text_message', index=5,
+      name='rx_text_message', full_name='DeviceState.rx_text_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='no_save', full_name='DeviceState.no_save', index=6,
+      name='no_save', full_name='DeviceState.no_save', index=7,
      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='did_gps_reset', full_name='DeviceState.did_gps_reset', index=7,
+      name='did_gps_reset', full_name='DeviceState.did_gps_reset', index=8,
      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,
@@ -133,8 +171,8 @@ _DEVICESTATE = _descriptor.Descriptor(
  extension_ranges=[],
  oneofs=[
  ],
-  serialized_start=48,
-  serialized_end=278,
+  serialized_start=198,
+  serialized_end=469,
 )


@@ -164,82 +202,40 @@ _CHANNELFILE = _descriptor.Descriptor(
  extension_ranges=[],
  oneofs=[
  ],
-  serialized_start=280,
-  serialized_end=321,
-)
-
-
-_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=324,
-  serialized_end=456,
+  serialized_start=471,
+  serialized_end=512,
 )

+_LEGACYRADIOCONFIG_LEGACYPREFERENCES.fields_by_name['region'].enum_type = radioconfig__pb2._REGIONCODE
+_LEGACYRADIOCONFIG_LEGACYPREFERENCES.containing_type = _LEGACYRADIOCONFIG
+_LEGACYRADIOCONFIG.fields_by_name['preferences'].message_type = _LEGACYRADIOCONFIG_LEGACYPREFERENCES
+_DEVICESTATE.fields_by_name['legacyRadio'].message_type = _LEGACYRADIOCONFIG
 _DEVICESTATE.fields_by_name['my_node'].message_type = mesh__pb2._MYNODEINFO
 _DEVICESTATE.fields_by_name['owner'].message_type = mesh__pb2._USER
 _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['LegacyRadioConfig'] = _LEGACYRADIOCONFIG
 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)

+LegacyRadioConfig = _reflection.GeneratedProtocolMessageType('LegacyRadioConfig', (_message.Message,), {
+
+  'LegacyPreferences' : _reflection.GeneratedProtocolMessageType('LegacyPreferences', (_message.Message,), {
+    'DESCRIPTOR' : _LEGACYRADIOCONFIG_LEGACYPREFERENCES,
+    '__module__' : 'deviceonly_pb2'
+    # @@protoc_insertion_point(class_scope:LegacyRadioConfig.LegacyPreferences)
+    })
+  ,
+  'DESCRIPTOR' : _LEGACYRADIOCONFIG,
+  '__module__' : 'deviceonly_pb2'
+  # @@protoc_insertion_point(class_scope:LegacyRadioConfig)
+  })
+_sym_db.RegisterMessage(LegacyRadioConfig)
+_sym_db.RegisterMessage(LegacyRadioConfig.LegacyPreferences)
+
 DeviceState = _reflection.GeneratedProtocolMessageType('DeviceState', (_message.Message,), {
  'DESCRIPTOR' : _DEVICESTATE,
  '__module__' : 'deviceonly_pb2'
@@ -254,13 +250,6 @@ 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/environmental_measurement_pb2.py
+++ b/meshtastic/environmental_measurement_pb2.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: environmental_measurement.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='environmental_measurement.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\x1f\x65nvironmental_measurement.proto\"\xa1\x01\n\x18\x45nvironmentalMeasurement\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\x42#Z!github.com/meshtastic/gomeshprotob\x06proto3'
+)
+
+
+
+
+_ENVIRONMENTALMEASUREMENT = _descriptor.Descriptor(
+  name='EnvironmentalMeasurement',
+  full_name='EnvironmentalMeasurement',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='temperature', full_name='EnvironmentalMeasurement.temperature', index=0,
+      number=1, 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='relative_humidity', full_name='EnvironmentalMeasurement.relative_humidity', index=1,
+      number=2, 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='barometric_pressure', full_name='EnvironmentalMeasurement.barometric_pressure', index=2,
+      number=3, 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='gas_resistance', full_name='EnvironmentalMeasurement.gas_resistance', index=3,
+      number=4, 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='voltage', full_name='EnvironmentalMeasurement.voltage', index=4,
+      number=5, 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='current', full_name='EnvironmentalMeasurement.current', 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),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=36,
+  serialized_end=197,
+)
+
+DESCRIPTOR.message_types_by_name['EnvironmentalMeasurement'] = _ENVIRONMENTALMEASUREMENT
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+EnvironmentalMeasurement = _reflection.GeneratedProtocolMessageType('EnvironmentalMeasurement', (_message.Message,), {
+  'DESCRIPTOR' : _ENVIRONMENTALMEASUREMENT,
+  '__module__' : 'environmental_measurement_pb2'
+  # @@protoc_insertion_point(class_scope:EnvironmentalMeasurement)
+  })
+_sym_db.RegisterMessage(EnvironmentalMeasurement)
+
+
+DESCRIPTOR._options = None
+# @@protoc_insertion_point(module_scope)
--- a/meshtastic/mesh_pb2.py
+++ b/meshtastic/mesh_pb2.py
--- a/meshtastic/node.py
+++ b/meshtastic/node.py
@@ -298,7 +298,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_module_part1_response
+                        self.cannedPluginMessagePart1 = p["decoded"]["admin"]["raw"].get_canned_message_plugin_part1_response
                        logging.debug(f'self.cannedPluginMessagePart1:{self.cannedPluginMessagePart1}')
                        self.gotResponse = True

@@ -314,7 +314,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_module_part2_response
+                        self.cannedPluginMessagePart2 = p["decoded"]["admin"]["raw"].get_canned_message_plugin_part2_response
                        logging.debug(f'self.cannedPluginMessagePart2:{self.cannedPluginMessagePart2}')
                        self.gotResponse = True

@@ -330,7 +330,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_module_part3_response
+                        self.cannedPluginMessagePart3 = p["decoded"]["admin"]["raw"].get_canned_message_plugin_part3_response
                        logging.debug(f'self.cannedPluginMessagePart3:{self.cannedPluginMessagePart3}')
                        self.gotResponse = True

@@ -346,7 +346,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_module_part4_response
+                        self.cannedPluginMessagePart4 = p["decoded"]["admin"]["raw"].get_canned_message_plugin_part4_response
                        logging.debug(f'self.cannedPluginMessagePart4:{self.cannedPluginMessagePart4}')
                        self.gotResponse = True

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

            p1 = admin_pb2.AdminMessage()
-            p1.get_canned_message_module_part1_request = True
+            p1.get_canned_message_plugin_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_module_part2_request = True
+            p2.get_canned_message_plugin_part2_request = True
            self.gotResponse = False
            self._sendAdmin(p2, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart2)
            while self.gotResponse is False:
                time.sleep(0.1)

            p3 = admin_pb2.AdminMessage()
-            p3.get_canned_message_module_part3_request = True
+            p3.get_canned_message_plugin_part3_request = True
            self.gotResponse = False
            self._sendAdmin(p3, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart3)
            while self.gotResponse is False:
                time.sleep(0.1)

            p4 = admin_pb2.AdminMessage()
-            p4.get_canned_message_module_part4_request = True
+            p4.get_canned_message_plugin_part4_request = True
            self.gotResponse = False
            self._sendAdmin(p4, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart4)
            while self.gotResponse is False:
@@ -425,13 +425,13 @@ class Node:

            # TODO: should be a way to improve this
            if i == 0:
-                p.set_canned_message_module_part1 = chunk
+                p.set_canned_message_plugin_part1 = chunk
            elif i == 1:
-                p.set_canned_message_module_part2 = chunk
+                p.set_canned_message_plugin_part2 = chunk
            elif i == 2:
-                p.set_canned_message_module_part3 = chunk
+                p.set_canned_message_plugin_part3 = chunk
            elif i == 3:
-                p.set_canned_message_module_part4 = chunk
+                p.set_canned_message_plugin_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*\xcb\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!\n\x1d\x45NVIRONMENTAL_MEASUREMENT_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(
@@ -77,7 +77,7 @@ _PORTNUM = _descriptor.EnumDescriptor(
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='TELEMETRY_APP', index=12, number=67,
+      name='ENVIRONMENTAL_MEASUREMENT_APP', index=12, number=67,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
@@ -100,7 +100,7 @@ _PORTNUM = _descriptor.EnumDescriptor(
  containing_type=None,
  serialized_options=None,
  serialized_start=19,
-  serialized_end=334,
+  serialized_end=350,
 )
 _sym_db.RegisterEnumDescriptor(_PORTNUM)

@@ -117,7 +117,7 @@ IP_TUNNEL_APP = 33
 SERIAL_APP = 64
 STORE_FORWARD_APP = 65
 RANGE_TEST_APP = 66
-TELEMETRY_APP = 67
+ENVIRONMENTAL_MEASUREMENT_APP = 67
 ZPS_APP = 68
 PRIVATE_APP = 256
 ATAK_FORWARDER = 257
--- a/meshtastic/radioconfig_pb2.py
+++ b/meshtastic/radioconfig_pb2.py
--- a/meshtastic/supported_device.py
+++ b/meshtastic/supported_device.py
@@ -40,13 +40,16 @@ tbeam_M8N_SX1262 = SupportedDevice(name="T-Beam", version="M8N_SX1262", for_firm
                                   usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
 tlora_v1 = SupportedDevice(name="T-Lora", version="1", for_firmware="tlora-v1",
                             baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial",
-                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
+                             usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60")
 tlora_v1_3 = SupportedDevice(name="T-Lora", version="1.3", for_firmware="tlora-v1-3",
                             baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial",
                             usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60")
 tlora_v2 = SupportedDevice(name="T-Lora", version="2", for_firmware="tlora-v2",
                             baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
+tlora_v2_1 = SupportedDevice(name="T-Lora", version="2.1", for_firmware="tlora-v2-1",
+                             baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
+                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
 tlora_v2_1_1_6 = SupportedDevice(name="T-Lora", version="2.1-1.6", for_firmware="tlora-v2-1-1.6",
                             baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
@@ -73,10 +76,6 @@ 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",
@@ -84,7 +83,7 @@ rak4631_19003 = SupportedDevice(name="RAK 4631 19003", version="", for_firmware=
                                usb_vendor_id_in_hex="239a", usb_product_id_in_hex="8029")

 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,
+                     tlora_v1, tlora_v1_3, tlora_v2, tlora_v2_1, tlora_v2_1_1_6,
                     heltec_v1, heltec_v2_0, heltec_v2_1,
-                     meshtastic_diy_v1, techo_1, rak4631_5005, rak4631_5005_epaper, rak4631_19003,
+                     meshtastic_diy_v1, techo_1, rak4631_5005, rak4631_19003,
                     rak11200]
--- a/meshtastic/telemetry_pb2.py
+++ b/meshtastic/telemetry_pb2.py
@@ -1,228 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: telemetry.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='telemetry.proto',
-  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'
-)
-
-
-
-
-_DEVICEMETRICS = _descriptor.Descriptor(
-  name='DeviceMetrics',
-  full_name='DeviceMetrics',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='battery_level', full_name='DeviceMetrics.battery_level', 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='voltage', full_name='DeviceMetrics.voltage', index=1,
-      number=2, 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='channel_utilization', full_name='DeviceMetrics.channel_utilization', index=2,
-      number=3, 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='air_util_tx', full_name='DeviceMetrics.air_util_tx', index=3,
-      number=4, 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),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=19,
-  serialized_end=124,
-)
-
-
-_ENVIRONMENTMETRICS = _descriptor.Descriptor(
-  name='EnvironmentMetrics',
-  full_name='EnvironmentMetrics',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='temperature', full_name='EnvironmentMetrics.temperature', index=0,
-      number=1, 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='relative_humidity', full_name='EnvironmentMetrics.relative_humidity', index=1,
-      number=2, 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='barometric_pressure', full_name='EnvironmentMetrics.barometric_pressure', index=2,
-      number=3, 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='gas_resistance', full_name='EnvironmentMetrics.gas_resistance', index=3,
-      number=4, 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='voltage', full_name='EnvironmentMetrics.voltage', index=4,
-      number=5, 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='current', full_name='EnvironmentMetrics.current', 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),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=127,
-  serialized_end=282,
-)
-
-
-_TELEMETRY = _descriptor.Descriptor(
-  name='Telemetry',
-  full_name='Telemetry',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='time', full_name='Telemetry.time', index=0,
-      number=1, 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='device_metrics', full_name='Telemetry.device_metrics', 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='environment_metrics', full_name='Telemetry.environment_metrics', 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),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-    _descriptor.OneofDescriptor(
-      name='variant', full_name='Telemetry.variant',
-      index=0, containing_type=None, fields=[]),
-  ],
-  serialized_start=285,
-  serialized_end=415,
-)
-
-_TELEMETRY.fields_by_name['device_metrics'].message_type = _DEVICEMETRICS
-_TELEMETRY.fields_by_name['environment_metrics'].message_type = _ENVIRONMENTMETRICS
-_TELEMETRY.oneofs_by_name['variant'].fields.append(
-  _TELEMETRY.fields_by_name['device_metrics'])
-_TELEMETRY.fields_by_name['device_metrics'].containing_oneof = _TELEMETRY.oneofs_by_name['variant']
-_TELEMETRY.oneofs_by_name['variant'].fields.append(
-  _TELEMETRY.fields_by_name['environment_metrics'])
-_TELEMETRY.fields_by_name['environment_metrics'].containing_oneof = _TELEMETRY.oneofs_by_name['variant']
-DESCRIPTOR.message_types_by_name['DeviceMetrics'] = _DEVICEMETRICS
-DESCRIPTOR.message_types_by_name['EnvironmentMetrics'] = _ENVIRONMENTMETRICS
-DESCRIPTOR.message_types_by_name['Telemetry'] = _TELEMETRY
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-DeviceMetrics = _reflection.GeneratedProtocolMessageType('DeviceMetrics', (_message.Message,), {
-  'DESCRIPTOR' : _DEVICEMETRICS,
-  '__module__' : 'telemetry_pb2'
-  # @@protoc_insertion_point(class_scope:DeviceMetrics)
-  })
-_sym_db.RegisterMessage(DeviceMetrics)
-
-EnvironmentMetrics = _reflection.GeneratedProtocolMessageType('EnvironmentMetrics', (_message.Message,), {
-  'DESCRIPTOR' : _ENVIRONMENTMETRICS,
-  '__module__' : 'telemetry_pb2'
-  # @@protoc_insertion_point(class_scope:EnvironmentMetrics)
-  })
-_sym_db.RegisterMessage(EnvironmentMetrics)
-
-Telemetry = _reflection.GeneratedProtocolMessageType('Telemetry', (_message.Message,), {
-  'DESCRIPTOR' : _TELEMETRY,
-  '__module__' : 'telemetry_pb2'
-  # @@protoc_insertion_point(class_scope:Telemetry)
-  })
-_sym_db.RegisterMessage(Telemetry)
-
-
-DESCRIPTOR._options = None
-# @@protoc_insertion_point(module_scope)
--- a/meshtastic/tests/test_main.py
+++ b/meshtastic/tests/test_main.py
@@ -46,7 +46,7 @@ def test_main_init_parser_version(capsys):
    assert pytest_wrapped_e.type == SystemExit
    assert pytest_wrapped_e.value.code == 0
    out, err = capsys.readouterr()
-    assert re.match(r'[0-9]+\.[0-9]+[\.a][0-9]', out)
+    assert re.match(r'[0-9]+\.[0-9]+\.[0-9]', out)
    assert err == ''


@@ -62,7 +62,7 @@ def test_main_main_version(capsys):
    assert pytest_wrapped_e.type == SystemExit
    assert pytest_wrapped_e.value.code == 0
    out, err = capsys.readouterr()
-    assert re.match(r'[0-9]+\.[0-9]+[\.a][0-9]', out)
+    assert re.match(r'[0-9]+\.[0-9]+\.[0-9]', out)
    assert err == ''


@@ -902,27 +902,6 @@ def test_main_set_valid_wifi_passwd(capsys):
        mo.assert_called()


-@pytest.mark.unit
-@pytest.mark.usefixtures("reset_globals")
-def test_main_set_invalid_wifi_passwd(capsys):
-    """Test --set with an invalid value (password must be 8 or more characters)"""
-    sys.argv = ['', '--set', 'wifi_password', '1234567']
-    Globals.getInstance().set_args(sys.argv)
-
-    mocked_node = MagicMock(autospec=Node)
-
-    iface = MagicMock(autospec=SerialInterface)
-    iface.getNode.return_value = mocked_node
-
-    with patch('meshtastic.serial_interface.SerialInterface', return_value=iface) as mo:
-        main()
-        out, err = capsys.readouterr()
-        assert re.search(r'Connected to radio', out, re.MULTILINE)
-        assert not re.search(r'Set wifi_password to 1234567', out, re.MULTILINE)
-        assert re.search(r'Warning: wifi_password must be 8 or more characters.', out, re.MULTILINE)
-        assert err == ''
-        mo.assert_called()
-
@pytest.mark.unit
@pytest.mark.usefixtures("reset_globals")
 def test_main_set_valid_camel_case(capsys):
@@ -1306,8 +1285,8 @@ def test_main_ch_enable_primary_channel(capsys):
@pytest.mark.usefixtures("reset_globals")
 def test_main_ch_range_options(capsys):
    """Test changing the various range options."""
-    range_options = ['--ch-vlongslow', '--ch-longslow', '--ch-longfast', '--ch-midslow',
-                     '--ch-midfast', '--ch-shortslow', '--ch-shortfast']
+    range_options = ['--ch-longslow', '--ch-longfast', '--ch-mediumslow',
+                     '--ch-mediumfast', '--ch-shortslow', '--ch-shortfast']
    for range_option in range_options:
        sys.argv = ['', f"{range_option}" ]
        Globals.getInstance().set_args(sys.argv)
@@ -2226,12 +2205,12 @@ def test_main_setPref_valid_field_invalid_enum_where_enums_are_camel_cased_value
    prefs = radioConfig.preferences

    with caplog.at_level(logging.DEBUG):
-        setPref(prefs, 'region', 'foo')
+        setPref(prefs, 'location_share', 'foo')
        out, err = capsys.readouterr()
-        assert re.search(r'region does not have an enum called foo', out, re.MULTILINE)
+        assert re.search(r'location_share does not have an enum called foo', out, re.MULTILINE)
        assert re.search(r'Choices in sorted order are', out, re.MULTILINE)
-        assert re.search(r'ANZ', out, re.MULTILINE)
-        assert re.search(r'CN', out, re.MULTILINE)
+        assert re.search(r'LocDisabled', out, re.MULTILINE)
+        assert re.search(r'LocEnabled', out, re.MULTILINE)
        assert err == ''


@@ -2352,54 +2331,6 @@ def test_main_setPref_invalid_field_camel(capsys):
    assert err == ''


-@pytest.mark.unit
-@pytest.mark.usefixtures("reset_globals")
-def test_main_setPref_ignore_incoming_123(capsys):
-    """Test setPref() with ignore_incoming"""
-
-    class Field:
-        """Simple class for testing."""
-
-        def __init__(self, name, enum_type):
-            """constructor"""
-            self.name = name
-            self.enum_type = enum_type
-
-    ignore_incoming_field = Field('ignore_incoming', 'list')
-    prefs = MagicMock()
-    prefs.DESCRIPTOR.fields_by_name.get.return_value = ignore_incoming_field
-
-    setPref(prefs, 'ignore_incoming', '123')
-    out, err = capsys.readouterr()
-    assert re.search(r"Adding '123' to the ignore_incoming list", out, re.MULTILINE)
-    assert re.search(r'Set ignore_incoming to 123', out, re.MULTILINE)
-    assert err == ''
-
-
-@pytest.mark.unit
-@pytest.mark.usefixtures("reset_globals")
-def test_main_setPref_ignore_incoming_0(capsys):
-    """Test setPref() with ignore_incoming"""
-
-    class Field:
-        """Simple class for testing."""
-
-        def __init__(self, name, enum_type):
-            """constructor"""
-            self.name = name
-            self.enum_type = enum_type
-
-    ignore_incoming_field = Field('ignore_incoming', 'list')
-    prefs = MagicMock()
-    prefs.DESCRIPTOR.fields_by_name.get.return_value = ignore_incoming_field
-
-    setPref(prefs, 'ignore_incoming', '0')
-    out, err = capsys.readouterr()
-    assert re.search(r'Clearing ignore_incoming list', out, re.MULTILINE)
-    assert re.search(r'Set ignore_incoming to 0', out, re.MULTILINE)
-    assert err == ''
-
-
@pytest.mark.unit
@pytest.mark.usefixtures("reset_globals")
 def test_main_ch_set_psk_no_ch_index(capsys):
--- a/meshtastic/tests/test_mesh_interface.py
+++ b/meshtastic/tests/test_mesh_interface.py
@@ -213,13 +213,13 @@ def test_handleFromRadio_with_my_info(caplog):
    # It "translates" to this:
    # my_info {
    #  my_node_num: 682584012
+    #  num_bands: 13
    #  firmware_version: "1.2.49.5354c49"
    #  reboot_count: 13
    #  bitrate: 17.088470458984375
    #  message_timeout_msec: 300000
    #  min_app_version: 20200
    #  max_channels: 8
-    #  has_wifi: true
    # }
    from_radio_bytes = b'\x1a,\x08\xcc\xcf\xbd\xc5\x02\x18\r2\x0e1.2.49.5354c49P\r]0\xb5\x88Ah\xe0\xa7\x12p\xe8\x9d\x01x\x08\x90\x01\x01'
    iface = MeshInterface(noProto=True)
@@ -227,6 +227,7 @@ def test_handleFromRadio_with_my_info(caplog):
        iface._handleFromRadio(from_radio_bytes)
    iface.close()
    assert re.search(r'Received myinfo', caplog.text, re.MULTILINE)
+    assert re.search(r'num_bands: 13', caplog.text, re.MULTILINE)
    assert re.search(r'max_channels: 8', caplog.text, re.MULTILINE)


--- a/meshtastic/tests/test_node.py
+++ b/meshtastic/tests/test_node.py
@@ -281,7 +281,7 @@ def test_setURL_valid_URL(caplog):
        anode.channels = channels
        anode.setURL(url)
    assert re.search(r'Channel i:0', caplog.text, re.MULTILINE)
-    assert re.search(r'modem_config: MidSlow', caplog.text, re.MULTILINE)
+    assert re.search(r'modem_config: Bw125Cr48Sf4096', caplog.text, re.MULTILINE)
    assert re.search(r'psk: "\\001"', caplog.text, re.MULTILINE)
    assert re.search(r'role: PRIMARY', caplog.text, re.MULTILINE)

@@ -335,7 +335,7 @@ def test_showChannels(capsys):
    # primary channel
    assert re.search(r'Primary channel URL', out, re.MULTILINE)
    assert re.search(r'PRIMARY psk=default ', out, re.MULTILINE)
-    assert re.search(r'"modemConfig": "MidSlow"', out, re.MULTILINE)
+    assert re.search(r'"modemConfig": "Bw125Cr48Sf4096"', out, re.MULTILINE)
    assert re.search(r'"psk": "AQ=="', out, re.MULTILINE)
    # secondary channel
    assert re.search(r'SECONDARY psk=secret ', out, re.MULTILINE)
--- a/meshtastic/tests/test_smoke1.py
+++ b/meshtastic/tests/test_smoke1.py
@@ -170,6 +170,20 @@ 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 """
@@ -188,6 +202,20 @@ 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"""
@@ -234,43 +262,19 @@ 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-vlongslow --ch-longslow, --ch-longfast, --ch-mediumslow, --ch-mediumsfast,
+    """Test --ch-longslow, --ch-longfast, --ch-mediumslow, --ch-mediumsfast,
       --ch-shortslow, and --ch-shortfast arguments
    """
    exp = {
-            '--ch-vlongslow': '{ "psk": "AQ==" }',
-            '--ch-longslow': 'LongSlow',
-            '--ch-longfast': 'LongFast',
-            '--ch-midslow': 'MidSlow',
-            '--ch-midfast': 'MidFast',
-            '--ch-shortslow': 'ShortSlow',
-            '--ch-shortfast': 'ShortFast'
+            '--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'
          }

    for key, val in exp.items():
@@ -574,6 +578,30 @@ 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"""
@@ -622,6 +650,7 @@ 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,6 +175,20 @@ 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 """
@@ -193,6 +207,20 @@ 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"""
@@ -245,12 +273,12 @@ def test_smokevirt_ch_values():
       --ch-shortslow, and --ch-shortfast arguments
    """
    exp = {
-            '--ch-longslow': 'LongSlow',
-            '--ch-longfast': 'LongFast',
-            '--ch-midslow': 'MidSlow',
-            '--ch-midfast': 'MidFast',
-            '--ch-shortslow': 'ShortSlow',
-            '--ch-shortfast': 'ShortFast'
+            '--ch-longslow': 'Bw125Cr48Sf4096',
+            '--ch-longfast': 'Bw31_25Cr48Sf512',
+            '--ch-mediumslow': 'Bw250Cr46Sf2048',
+            '--ch-mediumfast': 'Bw250Cr47Sf1024',
+            '--ch-shortslow': '{ "psk',
+            '--ch-shortfast': 'Bw500Cr45Sf128'
          }

    for key, val in exp.items():
@@ -583,14 +611,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 MidSlow --ch-index 0')
+    return_value, out = subprocess.getstatusoutput('meshtastic --host localhost --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 MidSlow', out, re.MULTILINE)
+    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 --host localhost --info')
-    assert re.search(r'MidSlow', out, re.MULTILINE)
+    assert re.search(r'Bw31_25Cr48Sf512', out, re.MULTILINE)
    assert return_value == 0


--- a/meshtastic/tests/test_util.py
+++ b/meshtastic/tests/test_util.py
@@ -337,9 +337,9 @@ def test_eliminate_duplicate_port():
    assert eliminate_duplicate_port(['/dev/cu.SLAB_USBtoUART', '/dev/cu.usbserial-0001']) == ['/dev/cu.usbserial-0001']
    assert eliminate_duplicate_port(['/dev/cu.usbserial-0001', '/dev/cu.SLAB_USBtoUART']) == ['/dev/cu.usbserial-0001']
    assert eliminate_duplicate_port(['/dev/cu.usbmodem11301', '/dev/cu.wchusbserial11301']) == ['/dev/cu.wchusbserial11301']
-    assert eliminate_duplicate_port(['/dev/cu.wchusbserial11301', '/dev/cu.usbmodem11301']) == ['/dev/cu.wchusbserial11301']
    assert eliminate_duplicate_port(['/dev/cu.usbmodem53230051441', '/dev/cu.wchusbserial53230051441']) == ['/dev/cu.wchusbserial53230051441']
    assert eliminate_duplicate_port(['/dev/cu.wchusbserial53230051441', '/dev/cu.usbmodem53230051441']) == ['/dev/cu.wchusbserial53230051441']
+    assert eliminate_duplicate_port(['/dev/cu.wchusbserial11301', '/dev/cu.usbmodem11301']) == ['/dev/cu.wchusbserial11301']

@patch('platform.version', return_value='10.0.22000.194')
@patch('platform.release', return_value='10')
--- 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 based on vendor id"""
+    """detect supported devices"""
    system = platform.system()
    #print(f'system:{system}')

@@ -285,8 +285,19 @@ 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:
-                    possible_devices.add(device)
+                    #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)

    elif system == "Windows":
        # if windows, run Get-PnpDevice
@@ -302,8 +313,22 @@ 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:
-                    possible_devices.add(device)
+                    #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)

    elif system == "Darwin":
        # run: system_profiler SPUSBDataType
@@ -318,8 +343,19 @@ 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:
-                    possible_devices.add(device)
+                    #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)
    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.12",
+    version="1.2.90",
    description="Python API & client shell for talking to Meshtastic devices",
    long_description=long_description,
    long_description_content_type="text/markdown",
@@ -22,7 +22,8 @@ setup(
    license="MIT",
    classifiers=[
        "License :: OSI Approved :: MIT License",
-        "Development Status :: 4 - Beta",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.6",
        "Programming Language :: Python :: 3.7",
        "Programming Language :: Python :: 3.8",
        "Programming Language :: Python :: 3.9",
@@ -37,7 +38,7 @@ setup(
    extras_require={
        'tunnel': ["pytap2>=2.0.0"]
    },
-    python_requires='>=3.7',
+    python_requires='>=3.6',
    entry_points={
        "console_scripts": [
            "meshtastic=meshtastic.__main__:main",
Author	SHA1	Message	Date
mkinney	5034e2ca43	Merge pull request #304 from mkinney/1.2-legacy fix some tlora entries	2022-03-15 19:33:47 -07:00
Mike Kinney	eb4f68fccc	fix some tlora entries	2022-03-15 19:32:27 -07:00
github-actions	de03f8e1fb	bump version	2022-03-08 18:57:44 +00:00
mkinney	56f3e8a893	Merge pull request #297 from mkinney/1.2-legacy refactor util; add duplicate check	2022-03-08 10:38:37 -08:00
mkinney	fbe0c09909	Merge branch '1.2-legacy' into 1.2-legacy	2022-03-08 10:37:15 -08:00
Mike Kinney	20c65974e9	refactor code to util	2022-03-08 10:34:46 -08:00
Mike Kinney	96e42ac3f2	add duplicate check	2022-03-08 10:24:44 -08:00
github-actions	3912f5728a	bump version	2022-03-08 06:40:00 +00:00
mkinney	c016176520	Update release.yml	2022-03-07 22:38:45 -08:00
Mike Kinney	e6999ba5ad	keep sha ref and use it for subsequent checkouts	2022-03-07 22:38:27 -08:00
Mike Kinney	5590dbeb6f	do not checkout the code again	2022-03-07 22:38:06 -08:00
mkinney	e8a2909173	Merge pull request #294 from mkinney/bug_when_ports_not_sorted fix when ports are not sorted	2022-03-07 22:37:49 -08:00