Med

Fixed med preset names
Merge pull request #368 from ghostop14/master
2025-12-26 01:17:51 -05:00 · 2022-09-08 07:09:25 -05:00 · 2022-09-08 07:09:13 -05:00 · 2022-09-08 06:58:18 -05:00 · 2022-09-05 20:30:29 -05:00 · 2022-09-06 10:23:19 +10:00
10 changed files with 119 additions and 98 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -132,6 +132,15 @@
      "justMyCode": true,
      "args": ["--debug", "--setchan", "psk", ""]
    },
+    {
+      "name": "meshtastic --ch-set",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "args": ["--debug", "--ch-set", "channel_num", "0", "--ch-index", "0"]
+    },
+    
    {
      "name": "meshtastic seturl",
      "type": "python",
--- a/meshtastic/main.py
+++ b/meshtastic/main.py
@@ -65,6 +65,7 @@ def getPref(config, comp_name):
    logging.debug(f'use camel:{Globals.getInstance().get_camel_case()}')

    objDesc = config.DESCRIPTOR
+    print()
    config_type = objDesc.fields_by_name.get(name[0])
    pref = False
    if config_type:
@@ -106,8 +107,11 @@ def setPref(config, comp_name, valStr):
    objDesc = config.DESCRIPTOR
    config_type = objDesc.fields_by_name.get(name[0])
    pref = False
-    if config_type:
+    if config_type and config_type.message_type is not None:
        pref = config_type.message_type.fields_by_name.get(snake_name)
+    # Others like ChannelSettings are standalone
+    elif config_type:
+        pref = config_type

    if (not pref) or (not config_type):
        return False
@@ -143,8 +147,11 @@ def setPref(config, comp_name, valStr):
    # note: 'ignore_incoming' is a repeating field
    if snake_name != 'ignore_incoming':
        try:
-            config_values = getattr(config, config_type.name)
-            setattr(config_values, pref.name, val)
+            if config_type.message_type is not None:
+                config_values = getattr(config, config_type.name)
+                setattr(config_values, pref.name, val)
+            else:
+                setattr(config, snake_name, val)
        except TypeError:
            # The setter didn't like our arg type guess try again as a string
            config_values = getattr(config, config_type.name)
@@ -158,10 +165,11 @@ def setPref(config, comp_name, valStr):
            print(f"Adding '{val}' to the ignore_incoming list")
            config_type.message_type.ignore_incoming.extend([val])

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

    return True

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

            print("Setting device position")
            # can include lat/long/alt etc: latitude = 37.5, longitude = -122.1
            interface.sendPosition(lat, lon, alt)
-            interface.localNode.writeConfig()
+            interface.localNode.writeConfig('position')
        elif not args.no_time:
            # We normally provide a current time to the mesh when we connect
            interface.sendPosition()
@@ -381,19 +389,19 @@ def onConnected(interface):

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

                if 'user_prefs' in configuration:
                    localConfig = interface.getNode(args.dest).localConfig
@@ -456,12 +464,10 @@ def onConnected(interface):

        def setSimpleConfig(modem_preset):
            """Set one of the simple modem_config"""
-            # Completely new radio settings
-            chs = config_pb2.Config.LoRaConfig()
-            chs.modem_preset = modem_preset
+            # Overwrite modem_preset
            prefs = interface.getNode(args.dest).localConfig
-            prefs.lora.CopyFrom(chs)
-            interface.getNode(args.dest).writeConfig()
+            prefs.lora.modem_preset = modem_preset
+            interface.getNode(args.dest).writeConfig('lora')

        # handle the simple radio set commands
        if args.ch_vlongslow:
@@ -473,11 +479,11 @@ def onConnected(interface):
        if args.ch_longfast:
            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LongFast)

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

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

        if args.ch_shortslow:
            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.ShortSlow)
@@ -823,10 +829,10 @@ def initParser():
        "--ch-longfast", help="Change to the long-range and fast channel", action='store_true')

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

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

    parser.add_argument(
        "--ch-shortslow", help="Change to the short-range and slow channel", action='store_true')
--- a/meshtastic/mesh_interface.py
+++ b/meshtastic/mesh_interface.py
@@ -675,7 +675,7 @@ class MeshInterface:
        # UNKNOWN_APP is the default protobuf portnum value, and therefore if not
        # set it will not be populated at all to make API usage easier, set
        # it to prevent confusion
-        if "portnum" not in decoded:
+        if decoded and "portnum" not in decoded:
            new_portnum = portnums_pb2.PortNum.Name(portnums_pb2.PortNum.UNKNOWN_APP)
            decoded["portnum"] = new_portnum
            logging.warning(f"portnum was not in decoded. Setting to:{new_portnum}")
--- a/meshtastic/mesh_pb2.py
+++ b/meshtastic/mesh_pb2.py
--- a/meshtastic/module_config_pb2.py
+++ b/meshtastic/module_config_pb2.py
@@ -12,10 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
 _sym_db = _symbol_database.Default()


-from . import telemetry_pb2 as telemetry__pb2


-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13module_config.proto\x1a\x0ftelemetry.proto\"\xa9\x11\n\x0cModuleConfig\x12(\n\x04mqtt\x18\x01 \x01(\x0b\x32\x18.ModuleConfig.MQTTConfigH\x00\x12,\n\x06serial\x18\x02 \x01(\x0b\x32\x1a.ModuleConfig.SerialConfigH\x00\x12I\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32(.ModuleConfig.ExternalNotificationConfigH\x00\x12\x39\n\rstore_forward\x18\x04 \x01(\x0b\x32 .ModuleConfig.StoreForwardConfigH\x00\x12\x33\n\nrange_test\x18\x05 \x01(\x0b\x32\x1d.ModuleConfig.RangeTestConfigH\x00\x12\x32\n\ttelemetry\x18\x06 \x01(\x0b\x32\x1d.ModuleConfig.TelemetryConfigH\x00\x12;\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32!.ModuleConfig.CannedMessageConfigH\x00\x1ao\n\nMQTTConfig\x12\x10\n\x08\x64isabled\x18\x01 \x01(\x08\x12\x0f\n\x07\x61\x64\x64ress\x18\x02 \x01(\t\x12\x10\n\x08username\x18\x03 \x01(\t\x12\x10\n\x08password\x18\x04 \x01(\t\x12\x1a\n\x12\x65ncryption_enabled\x18\x05 \x01(\x08\x1a\x93\x04\n\x0cSerialConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x0c\n\x04\x65\x63ho\x18\x02 \x01(\x08\x12\x0b\n\x03rxd\x18\x03 \x01(\r\x12\x0b\n\x03txd\x18\x04 \x01(\r\x12\x34\n\x04\x62\x61ud\x18\x05 \x01(\x0e\x32&.ModuleConfig.SerialConfig.Serial_Baud\x12\x0f\n\x07timeout\x18\x06 \x01(\r\x12\x34\n\x04mode\x18\x07 \x01(\x0e\x32&.ModuleConfig.SerialConfig.Serial_Mode\"\x8a\x02\n\x0bSerial_Baud\x12\x10\n\x0c\x42\x41UD_Default\x10\x00\x12\x0c\n\x08\x42\x41UD_110\x10\x01\x12\x0c\n\x08\x42\x41UD_300\x10\x02\x12\x0c\n\x08\x42\x41UD_600\x10\x03\x12\r\n\tBAUD_1200\x10\x04\x12\r\n\tBAUD_2400\x10\x05\x12\r\n\tBAUD_4800\x10\x06\x12\r\n\tBAUD_9600\x10\x07\x12\x0e\n\nBAUD_19200\x10\x08\x12\x0e\n\nBAUD_38400\x10\t\x12\x0e\n\nBAUD_57600\x10\n\x12\x0f\n\x0b\x42\x41UD_115200\x10\x0b\x12\x0f\n\x0b\x42\x41UD_230400\x10\x0c\x12\x0f\n\x0b\x42\x41UD_460800\x10\r\x12\x0f\n\x0b\x42\x41UD_576000\x10\x0e\x12\x0f\n\x0b\x42\x41UD_921600\x10\x0f\"@\n\x0bSerial_Mode\x12\x10\n\x0cMODE_Default\x10\x00\x12\x0f\n\x0bMODE_SIMPLE\x10\x01\x12\x0e\n\nMODE_PROTO\x10\x02\x1a\x8b\x01\n\x1a\x45xternalNotificationConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x11\n\toutput_ms\x18\x02 \x01(\r\x12\x0e\n\x06output\x18\x03 \x01(\r\x12\x0e\n\x06\x61\x63tive\x18\x04 \x01(\x08\x12\x15\n\ralert_message\x18\x05 \x01(\x08\x12\x12\n\nalert_bell\x18\x06 \x01(\x08\x1a\x84\x01\n\x12StoreForwardConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x11\n\theartbeat\x18\x02 \x01(\x08\x12\x0f\n\x07records\x18\x03 \x01(\r\x12\x1a\n\x12history_return_max\x18\x04 \x01(\r\x12\x1d\n\x15history_return_window\x18\x05 \x01(\r\x1a@\n\x0fRangeTestConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x0e\n\x06sender\x18\x02 \x01(\r\x12\x0c\n\x04save\x18\x03 \x01(\x08\x1a\xcb\x01\n\x0fTelemetryConfig\x12\x1e\n\x16\x64\x65vice_update_interval\x18\x01 \x01(\r\x12#\n\x1b\x65nvironment_update_interval\x18\x02 \x01(\r\x12\'\n\x1f\x65nvironment_measurement_enabled\x18\x03 \x01(\x08\x12\"\n\x1a\x65nvironment_screen_enabled\x18\x04 \x01(\x08\x12&\n\x1e\x65nvironment_display_fahrenheit\x18\x07 \x01(\x08\x1a\xd6\x04\n\x13\x43\x61nnedMessageConfig\x12\x17\n\x0frotary1_enabled\x18\x01 \x01(\x08\x12\x19\n\x11inputbroker_pin_a\x18\x02 \x01(\r\x12\x19\n\x11inputbroker_pin_b\x18\x03 \x01(\r\x12\x1d\n\x15inputbroker_pin_press\x18\x04 \x01(\r\x12N\n\x14inputbroker_event_cw\x18\x05 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12O\n\x15inputbroker_event_ccw\x18\x06 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12Q\n\x17inputbroker_event_press\x18\x07 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12\x17\n\x0fupdown1_enabled\x18\x08 \x01(\x08\x12\x0f\n\x07\x65nabled\x18\t \x01(\x08\x12\x1a\n\x12\x61llow_input_source\x18\n \x01(\t\x12\x11\n\tsend_bell\x18\x0b \x01(\x08\"\x83\x01\n\x0eInputEventChar\x12\x0c\n\x08KEY_NONE\x10\x00\x12\n\n\x06KEY_UP\x10\x11\x12\x0c\n\x08KEY_DOWN\x10\x12\x12\x0c\n\x08KEY_LEFT\x10\x13\x12\r\n\tKEY_RIGHT\x10\x14\x12\x0e\n\nKEY_SELECT\x10\n\x12\x0c\n\x08KEY_BACK\x10\x1b\x12\x0e\n\nKEY_CANCEL\x10\x18\x42\x10\n\x0epayloadVariantBN\n\x13\x63om.geeksville.meshB\x12ModuleConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13module_config.proto\"\xbf\x11\n\x0cModuleConfig\x12(\n\x04mqtt\x18\x01 \x01(\x0b\x32\x18.ModuleConfig.MQTTConfigH\x00\x12,\n\x06serial\x18\x02 \x01(\x0b\x32\x1a.ModuleConfig.SerialConfigH\x00\x12I\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32(.ModuleConfig.ExternalNotificationConfigH\x00\x12\x39\n\rstore_forward\x18\x04 \x01(\x0b\x32 .ModuleConfig.StoreForwardConfigH\x00\x12\x33\n\nrange_test\x18\x05 \x01(\x0b\x32\x1d.ModuleConfig.RangeTestConfigH\x00\x12\x32\n\ttelemetry\x18\x06 \x01(\x0b\x32\x1d.ModuleConfig.TelemetryConfigH\x00\x12;\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32!.ModuleConfig.CannedMessageConfigH\x00\x1a\x84\x01\n\nMQTTConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x0f\n\x07\x61\x64\x64ress\x18\x02 \x01(\t\x12\x10\n\x08username\x18\x03 \x01(\t\x12\x10\n\x08password\x18\x04 \x01(\t\x12\x1a\n\x12\x65ncryption_enabled\x18\x05 \x01(\x08\x12\x14\n\x0cjson_enabled\x18\x06 \x01(\x08\x1a\x93\x04\n\x0cSerialConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x0c\n\x04\x65\x63ho\x18\x02 \x01(\x08\x12\x0b\n\x03rxd\x18\x03 \x01(\r\x12\x0b\n\x03txd\x18\x04 \x01(\r\x12\x34\n\x04\x62\x61ud\x18\x05 \x01(\x0e\x32&.ModuleConfig.SerialConfig.Serial_Baud\x12\x0f\n\x07timeout\x18\x06 \x01(\r\x12\x34\n\x04mode\x18\x07 \x01(\x0e\x32&.ModuleConfig.SerialConfig.Serial_Mode\"\x8a\x02\n\x0bSerial_Baud\x12\x10\n\x0c\x42\x41UD_Default\x10\x00\x12\x0c\n\x08\x42\x41UD_110\x10\x01\x12\x0c\n\x08\x42\x41UD_300\x10\x02\x12\x0c\n\x08\x42\x41UD_600\x10\x03\x12\r\n\tBAUD_1200\x10\x04\x12\r\n\tBAUD_2400\x10\x05\x12\r\n\tBAUD_4800\x10\x06\x12\r\n\tBAUD_9600\x10\x07\x12\x0e\n\nBAUD_19200\x10\x08\x12\x0e\n\nBAUD_38400\x10\t\x12\x0e\n\nBAUD_57600\x10\n\x12\x0f\n\x0b\x42\x41UD_115200\x10\x0b\x12\x0f\n\x0b\x42\x41UD_230400\x10\x0c\x12\x0f\n\x0b\x42\x41UD_460800\x10\r\x12\x0f\n\x0b\x42\x41UD_576000\x10\x0e\x12\x0f\n\x0b\x42\x41UD_921600\x10\x0f\"@\n\x0bSerial_Mode\x12\x10\n\x0cMODE_Default\x10\x00\x12\x0f\n\x0bMODE_SIMPLE\x10\x01\x12\x0e\n\nMODE_PROTO\x10\x02\x1a\x8b\x01\n\x1a\x45xternalNotificationConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x11\n\toutput_ms\x18\x02 \x01(\r\x12\x0e\n\x06output\x18\x03 \x01(\r\x12\x0e\n\x06\x61\x63tive\x18\x04 \x01(\x08\x12\x15\n\ralert_message\x18\x05 \x01(\x08\x12\x12\n\nalert_bell\x18\x06 \x01(\x08\x1a\x84\x01\n\x12StoreForwardConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x11\n\theartbeat\x18\x02 \x01(\x08\x12\x0f\n\x07records\x18\x03 \x01(\r\x12\x1a\n\x12history_return_max\x18\x04 \x01(\r\x12\x1d\n\x15history_return_window\x18\x05 \x01(\r\x1a@\n\x0fRangeTestConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x0e\n\x06sender\x18\x02 \x01(\r\x12\x0c\n\x04save\x18\x03 \x01(\x08\x1a\xcb\x01\n\x0fTelemetryConfig\x12\x1e\n\x16\x64\x65vice_update_interval\x18\x01 \x01(\r\x12#\n\x1b\x65nvironment_update_interval\x18\x02 \x01(\r\x12\'\n\x1f\x65nvironment_measurement_enabled\x18\x03 \x01(\x08\x12\"\n\x1a\x65nvironment_screen_enabled\x18\x04 \x01(\x08\x12&\n\x1e\x65nvironment_display_fahrenheit\x18\x07 \x01(\x08\x1a\xd6\x04\n\x13\x43\x61nnedMessageConfig\x12\x17\n\x0frotary1_enabled\x18\x01 \x01(\x08\x12\x19\n\x11inputbroker_pin_a\x18\x02 \x01(\r\x12\x19\n\x11inputbroker_pin_b\x18\x03 \x01(\r\x12\x1d\n\x15inputbroker_pin_press\x18\x04 \x01(\r\x12N\n\x14inputbroker_event_cw\x18\x05 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12O\n\x15inputbroker_event_ccw\x18\x06 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12Q\n\x17inputbroker_event_press\x18\x07 \x01(\x0e\x32\x30.ModuleConfig.CannedMessageConfig.InputEventChar\x12\x17\n\x0fupdown1_enabled\x18\x08 \x01(\x08\x12\x0f\n\x07\x65nabled\x18\t \x01(\x08\x12\x1a\n\x12\x61llow_input_source\x18\n \x01(\t\x12\x11\n\tsend_bell\x18\x0b \x01(\x08\"\x83\x01\n\x0eInputEventChar\x12\x0c\n\x08KEY_NONE\x10\x00\x12\n\n\x06KEY_UP\x10\x11\x12\x0c\n\x08KEY_DOWN\x10\x12\x12\x0c\n\x08KEY_LEFT\x10\x13\x12\r\n\tKEY_RIGHT\x10\x14\x12\x0e\n\nKEY_SELECT\x10\n\x12\x0c\n\x08KEY_BACK\x10\x1b\x12\x0e\n\nKEY_CANCEL\x10\x18\x42\x10\n\x0epayloadVariantBN\n\x13\x63om.geeksville.meshB\x12ModuleConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3')



@@ -97,26 +96,26 @@ if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\022ModuleConfigProtosH\003Z!github.com/meshtastic/gomeshproto'
-  _MODULECONFIG._serialized_start=41
-  _MODULECONFIG._serialized_end=2258
-  _MODULECONFIG_MQTTCONFIG._serialized_start=445
-  _MODULECONFIG_MQTTCONFIG._serialized_end=556
-  _MODULECONFIG_SERIALCONFIG._serialized_start=559
-  _MODULECONFIG_SERIALCONFIG._serialized_end=1090
-  _MODULECONFIG_SERIALCONFIG_SERIAL_BAUD._serialized_start=758
-  _MODULECONFIG_SERIALCONFIG_SERIAL_BAUD._serialized_end=1024
-  _MODULECONFIG_SERIALCONFIG_SERIAL_MODE._serialized_start=1026
-  _MODULECONFIG_SERIALCONFIG_SERIAL_MODE._serialized_end=1090
-  _MODULECONFIG_EXTERNALNOTIFICATIONCONFIG._serialized_start=1093
-  _MODULECONFIG_EXTERNALNOTIFICATIONCONFIG._serialized_end=1232
-  _MODULECONFIG_STOREFORWARDCONFIG._serialized_start=1235
-  _MODULECONFIG_STOREFORWARDCONFIG._serialized_end=1367
-  _MODULECONFIG_RANGETESTCONFIG._serialized_start=1369
-  _MODULECONFIG_RANGETESTCONFIG._serialized_end=1433
-  _MODULECONFIG_TELEMETRYCONFIG._serialized_start=1436
-  _MODULECONFIG_TELEMETRYCONFIG._serialized_end=1639
-  _MODULECONFIG_CANNEDMESSAGECONFIG._serialized_start=1642
-  _MODULECONFIG_CANNEDMESSAGECONFIG._serialized_end=2240
-  _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR._serialized_start=2109
-  _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR._serialized_end=2240
+  _MODULECONFIG._serialized_start=24
+  _MODULECONFIG._serialized_end=2263
+  _MODULECONFIG_MQTTCONFIG._serialized_start=429
+  _MODULECONFIG_MQTTCONFIG._serialized_end=561
+  _MODULECONFIG_SERIALCONFIG._serialized_start=564
+  _MODULECONFIG_SERIALCONFIG._serialized_end=1095
+  _MODULECONFIG_SERIALCONFIG_SERIAL_BAUD._serialized_start=763
+  _MODULECONFIG_SERIALCONFIG_SERIAL_BAUD._serialized_end=1029
+  _MODULECONFIG_SERIALCONFIG_SERIAL_MODE._serialized_start=1031
+  _MODULECONFIG_SERIALCONFIG_SERIAL_MODE._serialized_end=1095
+  _MODULECONFIG_EXTERNALNOTIFICATIONCONFIG._serialized_start=1098
+  _MODULECONFIG_EXTERNALNOTIFICATIONCONFIG._serialized_end=1237
+  _MODULECONFIG_STOREFORWARDCONFIG._serialized_start=1240
+  _MODULECONFIG_STOREFORWARDCONFIG._serialized_end=1372
+  _MODULECONFIG_RANGETESTCONFIG._serialized_start=1374
+  _MODULECONFIG_RANGETESTCONFIG._serialized_end=1438
+  _MODULECONFIG_TELEMETRYCONFIG._serialized_start=1441
+  _MODULECONFIG_TELEMETRYCONFIG._serialized_end=1644
+  _MODULECONFIG_CANNEDMESSAGECONFIG._serialized_start=1647
+  _MODULECONFIG_CANNEDMESSAGECONFIG._serialized_end=2245
+  _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR._serialized_start=2114
+  _MODULECONFIG_CANNEDMESSAGECONFIG_INPUTEVENTCHAR._serialized_end=2245
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/node.py
+++ b/meshtastic/node.py
@@ -331,9 +331,12 @@ class Node:
            for c in self.channels:
                if c.role == channel_pb2.Channel.Role.PRIMARY or (includeAll and c.role == channel_pb2.Channel.Role.SECONDARY):
                    channelSet.settings.append(c.settings)
+
+        channelSet.lora_config.CopyFrom(self.localConfig.lora)
        some_bytes = channelSet.SerializeToString()
        s = base64.urlsafe_b64encode(some_bytes).decode('ascii')
-        return f"https://www.meshtastic.org/e/#{s}".replace("=", "")
+        s = s.replace("=", "").replace("+", "-").replace("/", "_")
+        return f"https://www.meshtastic.org/e/#{s}"

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

+        p = admin_pb2.AdminMessage()
+        p.set_config.lora.CopyFrom(channelSet.lora_config)
+        self._sendAdmin(p)
+
    def onResponseRequestCannedMessagePluginMessageMessages(self, p):
        """Handle the response packet for requesting canned message plugin message part 1"""
        logging.debug(f'onResponseRequestCannedMessagePluginMessageMessages() p:{p}')
--- a/meshtastic/tests/test_smoke1.py
+++ b/meshtastic/tests/test_smoke1.py
@@ -217,24 +217,24 @@ def test_smoke1_set_owner():
@pytest.mark.smoke1
 def test_smoke1_ch_set_modem_config():
    """Test --ch-set modem_config"""
-    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MidFast')
+    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MedFast')
    assert re.search(r'Warning: Need to specify', out, re.MULTILINE)
    assert return_value == 1
    # pause for the radio
    time.sleep(PAUSE_AFTER_COMMAND)
    return_value, out = subprocess.getstatusoutput('meshtastic --info')
-    assert not re.search(r'MidFast', out, re.MULTILINE)
+    assert not re.search(r'MedFast', out, re.MULTILINE)
    assert return_value == 0
    # pause for the radio
    time.sleep(PAUSE_AFTER_COMMAND)
-    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MidFast --ch-index 0')
+    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MedFast --ch-index 0')
    assert re.match(r'Connected to radio', out)
-    assert re.search(r'^Set modem_config to MidFast', out, re.MULTILINE)
+    assert re.search(r'^Set modem_config to MedFast', out, re.MULTILINE)
    assert return_value == 0
    # pause for the radio
    time.sleep(PAUSE_AFTER_REBOOT)
    return_value, out = subprocess.getstatusoutput('meshtastic --info')
-    assert re.search(r'MidFast', out, re.MULTILINE)
+    assert re.search(r'MedFast', out, re.MULTILINE)
    assert return_value == 0


@@ -247,8 +247,8 @@ def test_smoke1_ch_values():
            '--ch-vlongslow': '{ "psk": "AQ==" }',
            '--ch-longslow': 'LongSlow',
            '--ch-longfast': 'LongFast',
-            '--ch-midslow': 'MidSlow',
-            '--ch-midfast': 'MidFast',
+            '--ch-medslow': 'MedSlow',
+            '--ch-medfast': 'MedFast',
            '--ch-shortslow': 'ShortSlow',
            '--ch-shortfast': 'ShortFast'
          }
--- a/meshtastic/tests/test_smokevirt.py
+++ b/meshtastic/tests/test_smokevirt.py
@@ -227,8 +227,8 @@ def test_smokevirt_ch_values():
    exp = {
            '--ch-longslow': 'LongSlow',
            '--ch-longfast': 'LongFast',
-            '--ch-midslow': 'MidSlow',
-            '--ch-midfast': 'MidFast',
+            '--ch-medslow': 'MedSlow',
+            '--ch-medfast': 'MedFast',
            '--ch-shortslow': 'ShortSlow',
            '--ch-shortfast': 'ShortFast'
          }
--- a/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.23",
+    version="1.3alpha.27",
    description="Python API & client shell for talking to Meshtastic devices",
    long_description=long_description,
    long_description_content_type="text/markdown",
Author	SHA1	Message	Date
Ben Meadors	d852981371	Med	2022-09-08 07:09:25 -05:00
Ben Meadors	afed5bd943	Fixed med preset names	2022-09-08 07:09:13 -05:00
Ben Meadors	97b9041b76	Merge pull request #368 from ghostop14/master Fixes #367 MedFast Enum Not Defined	2022-09-08 06:58:18 -05:00
Ben Meadors	2dc14ef466	Merge pull request #369 from rohanki/master Fix for --setalt --setlat --setlon	2022-09-05 20:30:29 -05:00
Rohan King	8e69c32a36	Fix for --setalt --setlat --setlon fix for --setalt --setlat and --setlon	2022-09-06 10:23:19 +10:00
github-actions	42b33bea5b	bump version	2022-09-03 14:03:36 +00:00
Ben Meadors	7fd101cbf8	Update protos and fix error	2022-09-03 09:02:36 -05:00
ghostop14	92ee9889b1	Fixes #367 MedFast Enum Not Defined	2022-09-02 10:44:59 -04:00
github-actions	b6e1610abe	bump version	2022-08-27 13:37:05 +00:00
Ben Meadors	bde5db9c51	Fixed ch-set command in setPref	2022-08-27 08:14:48 -05:00
github-actions	148ae49ded	bump version	2022-08-25 18:25:24 +00:00
Ben Meadors	d1f8365da1	Merge pull request #363 from meshtastic/channel-url Channel setting fixed	2022-08-25 13:24:20 -05:00
Ben Meadors	59fc294d66	Channel setting fixed	2022-08-25 13:22:05 -05:00
github-actions	7473b4e18c	bump version	2022-08-17 02:49:05 +00:00
Ben Meadors	58aafcf3f1	Merge pull request #361 from Douile/dev-change-channel Fix changing modem_preset from CLI shortcuts	2022-08-16 08:58:56 -05:00
Douile	776fc57c35	Fix changing modem_preset from CLI shortcuts Previously the channel shortcuts (e.g. --ch-shortfast) would overrwrite the entire lora config, this meant you lost other configured things such as region. This patch changes that so that just modem_preset is overwritten, and also fixes the call to write config that was missing an argument.	2022-08-16 14:55:17 +01:00
Ben Meadors	b3f752a3c4	Merge pull request #360 from meshtastic/bt-canned Bluetooth and canned messages changes	2022-08-15 21:01:44 -05:00