Update protobuf submodule

bump version
Merge pull request #412 from meshtastic/remote-hardware
2025-12-26 01:17:51 -05:00 · 2022-12-28 16:37:24 +00:00 · 2022-12-27 21:23:16 +00:00 · 2022-12-27 22:16:57 +01:00 · 2022-12-27 21:32:25 +01:00 · 2022-12-22 14:35:48 -06:00
26 changed files with 431 additions and 210 deletions
--- a/.github/workflows/cleanup_artifacts.yml
+++ b/.github/workflows/cleanup_artifacts.yml
@@ -0,0 +1,20 @@
+name: Remove old artifacts
+
+on:
+  schedule:
+    # Every day at 1am
+    - cron: '0 1 * * *'
+    
+  workflow_dispatch:
+
+jobs:
+  remove-old-artifacts:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+    - name: Remove old artifacts
+      uses: c-hive/gha-remove-artifacts@v1
+      with:
+        age: '1 month'
+        skip-tags: true
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Meshtastic Python

-[![codecov](https://codecov.io/gh/meshtastic/python/branch/master/graph/badge.svg?token=TIWPJL73KV)](https://codecov.io/gh/meshtastic/python)
+[![codecov](https://codecov.io/gh/meshtastic/Meshtastic-python/branch/master/graph/badge.svg?token=TIWPJL73KV)](https://codecov.io/gh/meshtastic/Meshtastic-python)
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/meshtastic)
 [![CI](https://img.shields.io/github/workflow/status/meshtastic/python/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/python/actions/workflows/ci.yml)
 [![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/python)](https://cla-assistant.io/meshtastic/python)
--- a/bin/regen-protobufs.sh
+++ b/bin/regen-protobufs.sh
--- a/meshtastic/init.py
+++ b/meshtastic/init.py
@@ -183,5 +183,6 @@ protocols = {
    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.SIMULATOR_APP: KnownProtocol("simulator", mesh_pb2.Compressed)
+    portnums_pb2.PortNum.SIMULATOR_APP: KnownProtocol("simulator", mesh_pb2.Compressed),
+    portnums_pb2.PortNum.TRACEROUTE_APP: KnownProtocol("traceroute", mesh_pb2.RouteDiscovery)
 }
--- a/meshtastic/main.py
+++ b/meshtastic/main.py
@@ -177,6 +177,7 @@ def setPref(config, comp_name, valStr):
 def onConnected(interface):
    """Callback invoked when we connect to a radio"""
    closeNow = False  # Should we drop the connection after we finish?
+    waitForAckNak = False  # Should we wait for an acknowledgment if we send to a remote node?
    try:
        our_globals = Globals.getInstance()
        args = our_globals.get_args()
@@ -191,6 +192,7 @@ def onConnected(interface):
            alt = 0
            lat = 0.0
            lon = 0.0
+            # TODO: use getNode(args.dest) to be able to set it for a remote node 
            localConfig = interface.localNode.localConfig
            if args.setalt:
                alt = int(args.setalt)
@@ -215,19 +217,22 @@ def onConnected(interface):

        if args.set_owner:
            closeNow = True
+            waitForAckNak = True
            print(f"Setting device owner to {args.set_owner}")
-            interface.getNode(args.dest).setOwner(args.set_owner)
+            interface.getNode(args.dest, False).setOwner(args.set_owner)

        if args.set_owner_short:
            closeNow = True
+            waitForAckNak = True
            print(f"Setting device owner short to {args.set_owner_short}")
-            interface.getNode(args.dest).setOwner(long_name=None, short_name=args.set_owner_short)
+            interface.getNode(args.dest, False).setOwner(long_name=None, short_name=args.set_owner_short)

        # TODO: add to export-config and configure
        if args.set_canned_message:
            closeNow = True
+            waitForAckNak = True
            print(f"Setting canned plugin message to {args.set_canned_message}")
-            interface.getNode(args.dest).set_canned_message(args.set_canned_message)
+            interface.getNode(args.dest, False).set_canned_message(args.set_canned_message)

        if args.pos_fields:
            # If --pos-fields invoked with args, set position fields
@@ -271,27 +276,40 @@ def onConnected(interface):

        if args.reboot:
            closeNow = True
-            interface.getNode(args.dest).reboot()
+            waitForAckNak = True
+            interface.getNode(args.dest, False).reboot()

        if args.reboot_ota:
            closeNow = True
-            interface.getNode(args.dest).rebootOTA();
+            waitForAckNak = True
+            interface.getNode(args.dest, False).rebootOTA();

        if args.shutdown:
            closeNow = True
-            interface.getNode(args.dest).shutdown()
+            waitForAckNak = True
+            interface.getNode(args.dest, False).shutdown()
        
        if args.device_metadata:
            closeNow = True
            interface.getNode(args.dest).getMetadata()
+        
+        if args.begin_edit:
+            closeNow = True
+            interface.getNode(args.dest, False).beginSettingsTransaction()
+
+        if args.commit_edit:
+            closeNow = True
+            interface.getNode(args.dest, False).commitSettingsTransaction()

        if args.factory_reset:
            closeNow = True
-            interface.getNode(args.dest).factoryReset()
+            waitForAckNak = True
+            interface.getNode(args.dest, False).factoryReset()

        if args.reset_nodedb:
            closeNow = True
-            interface.getNode(args.dest).resetNodeDb()
+            waitForAckNak = True
+            interface.getNode(args.dest, False).resetNodeDb()

        if args.sendtext:
            closeNow = True
@@ -312,6 +330,13 @@ def onConnected(interface):
            interface.sendData(payload, args.dest, portNum=portnums_pb2.PortNum.REPLY_APP,
                               wantAck=True, wantResponse=True)

+        if args.traceroute:
+            loraConfig = getattr(interface.localNode.localConfig, 'lora')
+            hopLimit = getattr(loraConfig, 'hop_limit')
+            dest = str(args.traceroute)
+            print(f"Sending traceroute request to {dest} (this could take a while)")
+            interface.sendTraceRoute(dest, hopLimit)
+            
        if args.gpio_wrb or args.gpio_rd or args.gpio_watch:
            if args.dest == BROADCAST_ADDR:
                meshtastic.util.our_exit("Warning: Must use a destination node ID.")
@@ -376,17 +401,22 @@ def onConnected(interface):
                configuration = yaml.safe_load(file)
                closeNow = True

+                interface.getNode(args.dest, False).beginSettingsTransaction()
+
                if 'owner' in configuration:
                    print(f"Setting device owner to {configuration['owner']}")
-                    interface.getNode(args.dest).setOwner(configuration['owner'])
+                    waitForAckNak = True
+                    interface.getNode(args.dest, False).setOwner(configuration['owner'])

                if 'owner_short' in configuration:
                    print(f"Setting device owner short to {configuration['owner_short']}")
-                    interface.getNode(args.dest).setOwner(long_name=None, short_name=configuration['owner_short'])
+                    waitForAckNak = True
+                    interface.getNode(args.dest, False).setOwner(long_name=None, short_name=configuration['owner_short'])

                if 'ownerShort' in configuration:
                    print(f"Setting device owner short to {configuration['ownerShort']}")
-                    interface.getNode(args.dest).setOwner(long_name=None, short_name=configuration['ownerShort'])
+                    waitForAckNak = True
+                    interface.getNode(args.dest, False).setOwner(long_name=None, short_name=configuration['ownerShort'])

                if 'channel_url' in configuration:
                    print("Setting channel url to", configuration['channel_url'])
@@ -431,7 +461,8 @@ def onConnected(interface):
                        for pref in configuration['module_config'][section]:
                            setPref(moduleConfig, f"{section}.{pref}", str(configuration['module_config'][section][pref]))
                        interface.getNode(args.dest).writeConfig(section)
-                    
+
+                interface.getNode(args.dest, False).commitSettingsTransaction()
                print("Writing modified configuration to device")

        if args.export_config:
@@ -604,6 +635,10 @@ def onConnected(interface):
            else:
                tunnel.Tunnel(interface, subnet=args.tunnel_net)

+        if args.dest != BROADCAST_ADDR and waitForAckNak:
+            print(f"Waiting for an acknowledgment from remote node (this could take a while)")
+            interface.getNode(args.dest, False).iface.waitForAckNak()
+
        # if the user didn't ask for serial debugging output, we might want to exit after we've done our operation
        if (not args.seriallog) and closeNow:
            interface.close()  # after running command then exit
@@ -861,7 +896,7 @@ def initParser():
        "--ch-set", help=("Set a channel parameter. To see channel settings available:'--ch-set all all --ch-index 0'. "
                          "Can set the 'psk' using this command. To disable encryption on primary channel:'--ch-set psk none --ch-index 0'. "
                          "To set encryption with a new random key on second channel:'--ch-set psk random --ch-index 1'. "
-                          "To set encryption back to the default:'--ch-set default --ch-index 0'. To set encryption with your "
+                          "To set encryption back to the default:'--ch-set psk default --ch-index 0'. To set encryption with your "
                          "own key: '--ch-set psk 0x1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b --ch-index 0'."),
                          nargs=2, action='append')

@@ -907,6 +942,12 @@ def initParser():
    parser.add_argument(
        "--sendping", help="Send a ping message (which requests a reply)", action="store_true")

+    parser.add_argument(
+        "--traceroute", help="Traceroute from connected node to a destination. " \
+                             "You need pass the destination ID as argument, like " \
+                             "this: '--traceroute !ba4bf9d0' " \
+                             "Only nodes that have the encryption key can be traced.")     
+
    parser.add_argument(
        "--reboot", help="Tell the destination node to reboot", action="store_true")

@@ -918,6 +959,12 @@ def initParser():

    parser.add_argument(
        "--device-metadata", help="Get the device metadata from the node", action="store_true")
+    
+    parser.add_argument(
+        "--begin-edit", help="Tell the node to open a transaction to edit settings", action="store_true")
+
+    parser.add_argument(
+        "--commit-edit", help="Tell the node to commit open settings transaction", action="store_true")

    parser.add_argument(
        "--factory-reset", help="Tell the destination node to install the default config", action="store_true")
--- a/meshtastic/admin_pb2.py
+++ b/meshtastic/admin_pb2.py
@@ -19,7 +19,7 @@ from . import mesh_pb2 as mesh__pb2
 from . import module_config_pb2 as module__config__pb2


-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0b\x61\x64min.proto\x1a\rchannel.proto\x1a\x0c\x63onfig.proto\x1a\x15\x64\x65vice_metadata.proto\x1a\nmesh.proto\x1a\x13module_config.proto\"\xe8\n\n\x0c\x41\x64minMessage\x12\x1d\n\x13get_channel_request\x18\x01 \x01(\rH\x00\x12(\n\x14get_channel_response\x18\x02 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_owner_request\x18\x03 \x01(\x08H\x00\x12#\n\x12get_owner_response\x18\x04 \x01(\x0b\x32\x05.UserH\x00\x12\x36\n\x12get_config_request\x18\x05 \x01(\x0e\x32\x18.AdminMessage.ConfigTypeH\x00\x12&\n\x13get_config_response\x18\x06 \x01(\x0b\x32\x07.ConfigH\x00\x12\x43\n\x19get_module_config_request\x18\x07 \x01(\x0e\x32\x1e.AdminMessage.ModuleConfigTypeH\x00\x12\x33\n\x1aget_module_config_response\x18\x08 \x01(\x0b\x32\r.ModuleConfigH\x00\x12\x34\n*get_canned_message_module_messages_request\x18\n \x01(\x08H\x00\x12\x35\n+get_canned_message_module_messages_response\x18\x0b \x01(\tH\x00\x12%\n\x1bget_device_metadata_request\x18\x0c \x01(\x08H\x00\x12\x37\n\x1cget_device_metadata_response\x18\r \x01(\x0b\x32\x0f.DeviceMetadataH\x00\x12\x1a\n\tset_owner\x18  \x01(\x0b\x32\x05.UserH\x00\x12\x1f\n\x0bset_channel\x18! \x01(\x0b\x32\x08.ChannelH\x00\x12\x1d\n\nset_config\x18\" \x01(\x0b\x32\x07.ConfigH\x00\x12*\n\x11set_module_config\x18# \x01(\x0b\x32\r.ModuleConfigH\x00\x12,\n\"set_canned_message_module_messages\x18$ \x01(\tH\x00\x12\x1c\n\x12\x63onfirm_set_config\x18@ \x01(\x08H\x00\x12#\n\x19\x63onfirm_set_module_config\x18\x41 \x01(\x08H\x00\x12\x1d\n\x13\x63onfirm_set_channel\x18\x42 \x01(\x08H\x00\x12\x1b\n\x11\x63onfirm_set_radio\x18\x43 \x01(\x08H\x00\x12\x1c\n\x12reboot_ota_seconds\x18_ \x01(\x05H\x00\x12\x18\n\x0e\x65xit_simulator\x18` \x01(\x08H\x00\x12\x18\n\x0ereboot_seconds\x18\x61 \x01(\x05H\x00\x12\x1a\n\x10shutdown_seconds\x18\x62 \x01(\x05H\x00\x12\x17\n\rfactory_reset\x18\x63 \x01(\x05H\x00\x12\x16\n\x0cnodedb_reset\x18\x64 \x01(\x05H\x00\"\x95\x01\n\nConfigType\x12\x11\n\rDEVICE_CONFIG\x10\x00\x12\x13\n\x0fPOSITION_CONFIG\x10\x01\x12\x10\n\x0cPOWER_CONFIG\x10\x02\x12\x12\n\x0eNETWORK_CONFIG\x10\x03\x12\x12\n\x0e\x44ISPLAY_CONFIG\x10\x04\x12\x0f\n\x0bLORA_CONFIG\x10\x05\x12\x14\n\x10\x42LUETOOTH_CONFIG\x10\x06\"\xa6\x01\n\x10ModuleConfigType\x12\x0f\n\x0bMQTT_CONFIG\x10\x00\x12\x11\n\rSERIAL_CONFIG\x10\x01\x12\x13\n\x0f\x45XTNOTIF_CONFIG\x10\x02\x12\x17\n\x13STOREFORWARD_CONFIG\x10\x03\x12\x14\n\x10RANGETEST_CONFIG\x10\x04\x12\x14\n\x10TELEMETRY_CONFIG\x10\x05\x12\x14\n\x10\x43\x41NNEDMSG_CONFIG\x10\x06\x42\x11\n\x0fpayload_variantBH\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosH\x03Z\"github.com/meshtastic/go/generatedb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0b\x61\x64min.proto\x1a\rchannel.proto\x1a\x0c\x63onfig.proto\x1a\x15\x64\x65vice_metadata.proto\x1a\nmesh.proto\x1a\x13module_config.proto\"\xf6\n\n\x0c\x41\x64minMessage\x12\x1d\n\x13get_channel_request\x18\x01 \x01(\rH\x00\x12(\n\x14get_channel_response\x18\x02 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_owner_request\x18\x03 \x01(\x08H\x00\x12#\n\x12get_owner_response\x18\x04 \x01(\x0b\x32\x05.UserH\x00\x12\x36\n\x12get_config_request\x18\x05 \x01(\x0e\x32\x18.AdminMessage.ConfigTypeH\x00\x12&\n\x13get_config_response\x18\x06 \x01(\x0b\x32\x07.ConfigH\x00\x12\x43\n\x19get_module_config_request\x18\x07 \x01(\x0e\x32\x1e.AdminMessage.ModuleConfigTypeH\x00\x12\x33\n\x1aget_module_config_response\x18\x08 \x01(\x0b\x32\r.ModuleConfigH\x00\x12\x34\n*get_canned_message_module_messages_request\x18\n \x01(\x08H\x00\x12\x35\n+get_canned_message_module_messages_response\x18\x0b \x01(\tH\x00\x12%\n\x1bget_device_metadata_request\x18\x0c \x01(\x08H\x00\x12\x37\n\x1cget_device_metadata_response\x18\r \x01(\x0b\x32\x0f.DeviceMetadataH\x00\x12\x1a\n\tset_owner\x18  \x01(\x0b\x32\x05.UserH\x00\x12\x1f\n\x0bset_channel\x18! \x01(\x0b\x32\x08.ChannelH\x00\x12\x1d\n\nset_config\x18\" \x01(\x0b\x32\x07.ConfigH\x00\x12*\n\x11set_module_config\x18# \x01(\x0b\x32\r.ModuleConfigH\x00\x12,\n\"set_canned_message_module_messages\x18$ \x01(\tH\x00\x12\x1d\n\x13\x62\x65gin_edit_settings\x18@ \x01(\x08H\x00\x12\x1e\n\x14\x63ommit_edit_settings\x18\x41 \x01(\x08H\x00\x12\x1d\n\x13\x63onfirm_set_channel\x18\x42 \x01(\x08H\x00\x12\x1b\n\x11\x63onfirm_set_radio\x18\x43 \x01(\x08H\x00\x12\x1c\n\x12reboot_ota_seconds\x18_ \x01(\x05H\x00\x12\x18\n\x0e\x65xit_simulator\x18` \x01(\x08H\x00\x12\x18\n\x0ereboot_seconds\x18\x61 \x01(\x05H\x00\x12\x1a\n\x10shutdown_seconds\x18\x62 \x01(\x05H\x00\x12\x17\n\rfactory_reset\x18\x63 \x01(\x05H\x00\x12\x16\n\x0cnodedb_reset\x18\x64 \x01(\x05H\x00\"\x95\x01\n\nConfigType\x12\x11\n\rDEVICE_CONFIG\x10\x00\x12\x13\n\x0fPOSITION_CONFIG\x10\x01\x12\x10\n\x0cPOWER_CONFIG\x10\x02\x12\x12\n\x0eNETWORK_CONFIG\x10\x03\x12\x12\n\x0e\x44ISPLAY_CONFIG\x10\x04\x12\x0f\n\x0bLORA_CONFIG\x10\x05\x12\x14\n\x10\x42LUETOOTH_CONFIG\x10\x06\"\xb8\x01\n\x10ModuleConfigType\x12\x0f\n\x0bMQTT_CONFIG\x10\x00\x12\x11\n\rSERIAL_CONFIG\x10\x01\x12\x13\n\x0f\x45XTNOTIF_CONFIG\x10\x02\x12\x17\n\x13STOREFORWARD_CONFIG\x10\x03\x12\x14\n\x10RANGETEST_CONFIG\x10\x04\x12\x14\n\x10TELEMETRY_CONFIG\x10\x05\x12\x14\n\x10\x43\x41NNEDMSG_CONFIG\x10\x06\x12\x10\n\x0c\x41UDIO_CONFIG\x10\x07\x42\x11\n\x0fpayload_variantB_\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosH\x03Z\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufsb\x06proto3')



@@ -36,11 +36,11 @@ _sym_db.RegisterMessage(AdminMessage)
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\013AdminProtosH\003Z\"github.com/meshtastic/go/generated'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\013AdminProtosH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
  _ADMINMESSAGE._serialized_start=101
-  _ADMINMESSAGE._serialized_end=1485
-  _ADMINMESSAGE_CONFIGTYPE._serialized_start=1148
-  _ADMINMESSAGE_CONFIGTYPE._serialized_end=1297
-  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_start=1300
-  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_end=1466
+  _ADMINMESSAGE._serialized_end=1499
+  _ADMINMESSAGE_CONFIGTYPE._serialized_start=1144
+  _ADMINMESSAGE_CONFIGTYPE._serialized_end=1293
+  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_start=1296
+  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_end=1480
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/apponly_pb2.py
+++ b/meshtastic/apponly_pb2.py
@@ -16,7 +16,7 @@ from . import channel_pb2 as channel__pb2
 from . import config_pb2 as config__pb2


-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\rapponly.proto\x1a\rchannel.proto\x1a\x0c\x63onfig.proto\"Y\n\nChannelSet\x12\"\n\x08settings\x18\x01 \x03(\x0b\x32\x10.ChannelSettings\x12\'\n\x0blora_config\x18\x02 \x01(\x0b\x32\x12.Config.LoRaConfigBJ\n\x13\x63om.geeksville.meshB\rAppOnlyProtosH\x03Z\"github.com/meshtastic/go/generatedb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\rapponly.proto\x1a\rchannel.proto\x1a\x0c\x63onfig.proto\"Y\n\nChannelSet\x12\"\n\x08settings\x18\x01 \x03(\x0b\x32\x10.ChannelSettings\x12\'\n\x0blora_config\x18\x02 \x01(\x0b\x32\x12.Config.LoRaConfigBa\n\x13\x63om.geeksville.meshB\rAppOnlyProtosH\x03Z\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufsb\x06proto3')



@@ -31,7 +31,7 @@ _sym_db.RegisterMessage(ChannelSet)
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rAppOnlyProtosH\003Z\"github.com/meshtastic/go/generated'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rAppOnlyProtosH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
  _CHANNELSET._serialized_start=46
  _CHANNELSET._serialized_end=135
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/cannedmessages_pb2.py
+++ b/meshtastic/cannedmessages_pb2.py
@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()



-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x63\x61nnedmessages.proto\"-\n\x19\x43\x61nnedMessageModuleConfig\x12\x10\n\x08messages\x18\x01 \x01(\tBV\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosH\x03Z\"github.com/meshtastic/go/generatedb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x63\x61nnedmessages.proto\"-\n\x19\x43\x61nnedMessageModuleConfig\x12\x10\n\x08messages\x18\x01 \x01(\tBm\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosH\x03Z\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufsb\x06proto3')



@@ -29,7 +29,7 @@ _sym_db.RegisterMessage(CannedMessageModuleConfig)
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\031CannedMessageConfigProtosH\003Z\"github.com/meshtastic/go/generated'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\031CannedMessageConfigProtosH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
  _CANNEDMESSAGEMODULECONFIG._serialized_start=24
  _CANNEDMESSAGEMODULECONFIG._serialized_end=69
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/channel_pb2.py
+++ b/meshtastic/channel_pb2.py
@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()



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



@@ -38,7 +38,7 @@ _sym_db.RegisterMessage(Channel)
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rChannelProtosH\003Z\"github.com/meshtastic/go/generated'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rChannelProtosH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
  _CHANNELSETTINGS.fields_by_name['channel_num']._options = None
  _CHANNELSETTINGS.fields_by_name['channel_num']._serialized_options = b'\030\001'
  _CHANNELSETTINGS._serialized_start=18
--- a/meshtastic/config_pb2.py
+++ b/meshtastic/config_pb2.py
--- a/meshtastic/device_metadata_pb2.py
+++ b/meshtastic/device_metadata_pb2.py
@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()



-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x64\x65vice_metadata.proto\"H\n\x0e\x44\x65viceMetadata\x12\x18\n\x10\x66irmware_version\x18\x01 \x01(\t\x12\x1c\n\x14\x64\x65vice_state_version\x18\x02 \x01(\rBQ\n\x13\x63om.geeksville.meshB\x14\x44\x65viceMetadataProtosH\x03Z\"github.com/meshtastic/go/generatedb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x64\x65vice_metadata.proto\"\x99\x01\n\x0e\x44\x65viceMetadata\x12\x18\n\x10\x66irmware_version\x18\x01 \x01(\t\x12\x1c\n\x14\x64\x65vice_state_version\x18\x02 \x01(\r\x12\x13\n\x0b\x63\x61nShutdown\x18\x03 \x01(\x08\x12\x0f\n\x07hasWifi\x18\x04 \x01(\x08\x12\x14\n\x0chasBluetooth\x18\x05 \x01(\x08\x12\x13\n\x0bhasEthernet\x18\x06 \x01(\x08\x42h\n\x13\x63om.geeksville.meshB\x14\x44\x65viceMetadataProtosH\x03Z\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufsb\x06proto3')



@@ -29,7 +29,7 @@ _sym_db.RegisterMessage(DeviceMetadata)
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\024DeviceMetadataProtosH\003Z\"github.com/meshtastic/go/generated'
-  _DEVICEMETADATA._serialized_start=25
-  _DEVICEMETADATA._serialized_end=97
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\024DeviceMetadataProtosH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
+  _DEVICEMETADATA._serialized_start=26
+  _DEVICEMETADATA._serialized_end=179
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/deviceonly_pb2.py
+++ b/meshtastic/deviceonly_pb2.py
@@ -17,7 +17,7 @@ from . import channel_pb2 as channel__pb2
 from . import mesh_pb2 as mesh__pb2


-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10\x64\x65viceonly.proto\x1a\rchannel.proto\x1a\nmesh.proto\"\xe0\x01\n\x0b\x44\x65viceState\x12\x1c\n\x07my_node\x18\x02 \x01(\x0b\x32\x0b.MyNodeInfo\x12\x14\n\x05owner\x18\x03 \x01(\x0b\x32\x05.User\x12\x1a\n\x07node_db\x18\x04 \x03(\x0b\x32\t.NodeInfo\x12\"\n\rreceive_queue\x18\x05 \x03(\x0b\x32\x0b.MeshPacket\x12\x0f\n\x07version\x18\x08 \x01(\r\x12$\n\x0frx_text_message\x18\x07 \x01(\x0b\x32\x0b.MeshPacket\x12\x0f\n\x07no_save\x18\t \x01(\x08\x12\x15\n\rdid_gps_reset\x18\x0b \x01(\x08\":\n\x0b\x43hannelFile\x12\x1a\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x08.Channel\x12\x0f\n\x07version\x18\x02 \x01(\r\"\x99\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\x12\x13\n\x0boem_aes_key\x18\x06 \x01(\x0c*>\n\x0bScreenFonts\x12\x0e\n\nFONT_SMALL\x10\x00\x12\x0f\n\x0b\x46ONT_MEDIUM\x10\x01\x12\x0e\n\nFONT_LARGE\x10\x02\x42G\n\x13\x63om.geeksville.meshB\nDeviceOnlyH\x03Z\"github.com/meshtastic/go/generatedb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10\x64\x65viceonly.proto\x1a\rchannel.proto\x1a\nmesh.proto\"\xe0\x01\n\x0b\x44\x65viceState\x12\x1c\n\x07my_node\x18\x02 \x01(\x0b\x32\x0b.MyNodeInfo\x12\x14\n\x05owner\x18\x03 \x01(\x0b\x32\x05.User\x12\x1a\n\x07node_db\x18\x04 \x03(\x0b\x32\t.NodeInfo\x12\"\n\rreceive_queue\x18\x05 \x03(\x0b\x32\x0b.MeshPacket\x12\x0f\n\x07version\x18\x08 \x01(\r\x12$\n\x0frx_text_message\x18\x07 \x01(\x0b\x32\x0b.MeshPacket\x12\x0f\n\x07no_save\x18\t \x01(\x08\x12\x15\n\rdid_gps_reset\x18\x0b \x01(\x08\":\n\x0b\x43hannelFile\x12\x1a\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x08.Channel\x12\x0f\n\x07version\x18\x02 \x01(\r\"\x99\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\x12\x13\n\x0boem_aes_key\x18\x06 \x01(\x0c*>\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^\n\x13\x63om.geeksville.meshB\nDeviceOnlyH\x03Z\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufsb\x06proto3')

 _SCREENFONTS = DESCRIPTOR.enum_types_by_name['ScreenFonts']
 ScreenFonts = enum_type_wrapper.EnumTypeWrapper(_SCREENFONTS)
@@ -53,7 +53,7 @@ _sym_db.RegisterMessage(OEMStore)
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nDeviceOnlyH\003Z\"github.com/meshtastic/go/generated'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nDeviceOnlyH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
  _SCREENFONTS._serialized_start=490
  _SCREENFONTS._serialized_end=552
  _DEVICESTATE._serialized_start=48
--- a/meshtastic/localonly_pb2.py
+++ b/meshtastic/localonly_pb2.py
@@ -16,7 +16,7 @@ from . import config_pb2 as config__pb2
 from . import module_config_pb2 as module__config__pb2


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



@@ -39,9 +39,9 @@ _sym_db.RegisterMessage(LocalModuleConfig)
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\017LocalOnlyProtosH\003Z\"github.com/meshtastic/go/generated'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\017LocalOnlyProtosH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
  _LOCALCONFIG._serialized_start=55
  _LOCALCONFIG._serialized_end=359
  _LOCALMODULECONFIG._serialized_start=362
-  _LOCALMODULECONFIG._serialized_end=772
+  _LOCALMODULECONFIG._serialized_end=814
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/mesh_interface.py
+++ b/meshtastic/mesh_interface.py
@@ -18,7 +18,7 @@ from google.protobuf.json_format import MessageToJson

 import meshtastic.node
 from meshtastic import portnums_pb2, mesh_pb2
-from meshtastic.util import stripnl, Timeout, our_exit, remove_keys_from_dict, convert_mac_addr
+from meshtastic.util import stripnl, Timeout, Acknowledgment, our_exit, remove_keys_from_dict, convert_mac_addr
 from meshtastic.__init__ import LOCAL_ADDR, BROADCAST_NUM, BROADCAST_ADDR, ResponseHandler, publishingThread, OUR_APP_VERSION, protocols

 class MeshInterface:
@@ -47,12 +47,12 @@ class MeshInterface:
        self.responseHandlers = {}  # A map from request ID to the handler
        self.failure = None  # If we've encountered a fatal exception it will be kept here
        self._timeout = Timeout()
+        self._acknowledgment = Acknowledgment()
        self.heartbeatTimer = None
        random.seed()  # FIXME, we should not clobber the random seedval here, instead tell user they must call it
        self.currentPacketId = random.randint(0, 0xffffffff)
        self.nodesByNum = None
        self.configId = None
-        self.defaultHopLimit = 3
        self.gotResponse = False # used in gpio read
        self.mask = None # used in gpio read and gpio watch

@@ -157,23 +157,24 @@ class MeshInterface:
        return table


-    def getNode(self, nodeId):
+    def getNode(self, nodeId, requestConfig=True):
        """Return a node object which contains device settings and channel info"""
        if nodeId in (LOCAL_ADDR, BROADCAST_ADDR):
            return self.localNode
        else:
            n = meshtastic.node.Node(self, nodeId)
-            logging.debug("About to requestConfig")
-            n.requestConfig()
-            if not n.waitForConfig():
-                our_exit("Error: Timed out waiting for node config")
+            # Only request device settings and channel info when necessary
+            if requestConfig:
+              logging.debug("About to requestConfig")
+              n.requestConfig()
+              if not n.waitForConfig():
+                  our_exit("Error: Timed out waiting for node config")
            return n

    def sendText(self, text: AnyStr,
                 destinationId=BROADCAST_ADDR,
                 wantAck=False,
                 wantResponse=False,
-                 hopLimit=None,
                 onResponse=None,
                 channelIndex=0):
        """Send a utf8 string to some other node, if the node has a display it
@@ -195,21 +196,17 @@ class MeshInterface:
        Returns the sent packet. The id field will be populated in this packet
        and can be used to track future message acks/naks.
        """
-        if hopLimit is None:
-            hopLimit = self.defaultHopLimit

        return self.sendData(text.encode("utf-8"), destinationId,
                             portNum=portnums_pb2.PortNum.TEXT_MESSAGE_APP,
                             wantAck=wantAck,
                             wantResponse=wantResponse,
-                             hopLimit=hopLimit,
                             onResponse=onResponse,
                             channelIndex=channelIndex)

    def sendData(self, data, destinationId=BROADCAST_ADDR,
                 portNum=portnums_pb2.PortNum.PRIVATE_APP, wantAck=False,
                 wantResponse=False,
-                 hopLimit=None,
                 onResponse=None,
                 channelIndex=0):
        """Send a data packet to some other node
@@ -234,8 +231,6 @@ class MeshInterface:
        Returns the sent packet. The id field will be populated in this packet
        and can be used to track future message acks/naks.
        """
-        if hopLimit is None:
-            hopLimit = self.defaultHopLimit

        if getattr(data, "SerializeToString", None):
            logging.debug(f"Serializing protobuf as data: {stripnl(data)}")
@@ -258,8 +253,7 @@ class MeshInterface:

        if onResponse is not None:
            self._addResponseHandler(meshPacket.id, onResponse)
-        p = self._sendPacket(meshPacket, destinationId,
-                             wantAck=wantAck, hopLimit=hopLimit)
+        p = self._sendPacket(meshPacket, destinationId, wantAck=wantAck)
        return p

    def sendPosition(self, latitude=0.0, longitude=0.0, altitude=0, timeSec=0,
@@ -297,21 +291,42 @@ class MeshInterface:
                             portNum=portnums_pb2.PortNum.POSITION_APP,
                             wantAck=wantAck,
                             wantResponse=wantResponse)
+  
+    def sendTraceRoute(self, dest, hopLimit):
+        r = mesh_pb2.RouteDiscovery()
+        self.sendData(r, destinationId=dest, portNum=portnums_pb2.PortNum.TRACEROUTE_APP,
+                      wantResponse=True, onResponse=self.onResponseTraceRoute)
+        # extend timeout based on number of nodes, limit by configured hopLimit
+        waitFactor = min(len(self.nodes)-1, hopLimit)  
+        self.waitForTraceRoute(waitFactor)
+
+    def onResponseTraceRoute(self, p):
+        routeDiscovery = mesh_pb2.RouteDiscovery()
+        routeDiscovery.ParseFromString(p["decoded"]["payload"])
+        asDict = google.protobuf.json_format.MessageToDict(routeDiscovery)
+
+        print("Route traced:")
+        routeStr = self._nodeNumToId(p["to"])
+        if "route" in asDict:
+          for nodeNum in asDict["route"]:
+            routeStr += " --> " + self._nodeNumToId(nodeNum) 
+        routeStr += " --> " + self._nodeNumToId(p["from"])
+        print(routeStr)
+
+        self._acknowledgment.receivedTraceRoute = True

    def _addResponseHandler(self, requestId, callback):
        self.responseHandlers[requestId] = ResponseHandler(callback)

    def _sendPacket(self, meshPacket,
                    destinationId=BROADCAST_ADDR,
-                    wantAck=False, hopLimit=None):
+                    wantAck=False):
        """Send a MeshPacket to the specified node (or if unspecified, broadcast).
        You probably don't want this - use sendData instead.

        Returns the sent packet. The id field will be populated in this packet and
        can be used to track future message acks/naks.
        """
-        if hopLimit is None:
-            hopLimit = self.defaultHopLimit

        # We allow users to talk to the local node before we've completed the full connection flow...
        if(self.myInfo is not None and destinationId != self.myInfo.my_node_num):
@@ -345,6 +360,8 @@ class MeshInterface:

        meshPacket.to = nodeNum
        meshPacket.want_ack = wantAck
+        loraConfig = getattr(self.localNode.localConfig, 'lora')
+        hopLimit = getattr(loraConfig, 'hop_limit')
        meshPacket.hop_limit = hopLimit

        # if the user hasn't set an ID for this packet (likely and recommended),
@@ -366,6 +383,16 @@ class MeshInterface:
        if not success:
            raise Exception("Timed out waiting for interface config")

+    def waitForAckNak(self):
+        success = self._timeout.waitForAckNak(self._acknowledgment)
+        if not success:
+            raise Exception("Timed out waiting for an acknowledgment")
+
+    def waitForTraceRoute(self, waitFactor):
+        success = self._timeout.waitForTraceRoute(waitFactor, self._acknowledgment)
+        if not success:
+            raise Exception("Timed out waiting for traceroute")
+
    def getMyNodeInfo(self):
        """Get info about my node."""
        if self.myInfo is None:
@@ -717,7 +744,8 @@ class MeshInterface:
                # we keep the responseHandler in dict until we get a non ack
                handler = self.responseHandlers.pop(requestId, None)
                if handler is not None:
-                    handler.callback(asDict)
+                    if not isAck or (isAck and handler.__name__ == "onAckNak"):
+                      handler.callback(asDict)

        logging.debug(f"Publishing {topic}: packet={stripnl(asDict)} ")
        publishingThread.queueWork(lambda: pub.sendMessage(
--- a/meshtastic/mesh_pb2.py
+++ b/meshtastic/mesh_pb2.py
--- a/meshtastic/module_config_pb2.py
+++ b/meshtastic/module_config_pb2.py
--- a/meshtastic/mqtt_pb2.py
+++ b/meshtastic/mqtt_pb2.py
@@ -15,7 +15,7 @@ _sym_db = _symbol_database.Default()
 from . import mesh_pb2 as mesh__pb2


-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nmqtt.proto\x1a\nmesh.proto\"V\n\x0fServiceEnvelope\x12\x1b\n\x06packet\x18\x01 \x01(\x0b\x32\x0b.MeshPacket\x12\x12\n\nchannel_id\x18\x02 \x01(\t\x12\x12\n\ngateway_id\x18\x03 \x01(\tBG\n\x13\x63om.geeksville.meshB\nMQTTProtosH\x03Z\"github.com/meshtastic/go/generatedb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nmqtt.proto\x1a\nmesh.proto\"V\n\x0fServiceEnvelope\x12\x1b\n\x06packet\x18\x01 \x01(\x0b\x32\x0b.MeshPacket\x12\x12\n\nchannel_id\x18\x02 \x01(\t\x12\x12\n\ngateway_id\x18\x03 \x01(\tB^\n\x13\x63om.geeksville.meshB\nMQTTProtosH\x03Z\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufsb\x06proto3')



@@ -30,7 +30,7 @@ _sym_db.RegisterMessage(ServiceEnvelope)
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nMQTTProtosH\003Z\"github.com/meshtastic/go/generated'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nMQTTProtosH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
  _SERVICEENVELOPE._serialized_start=26
  _SERVICEENVELOPE._serialized_end=112
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/node.py
+++ b/meshtastic/node.py
@@ -181,6 +181,13 @@ class Node:
            logging.debug("Wrote module: canned_message")
            time.sleep(0.3)

+        if self.moduleConfig.audio:
+            p = admin_pb2.AdminMessage()
+            p.set_module_config.audio.CopyFrom(self.moduleConfig.audio)
+            self._sendAdmin(p)
+            logging.debug("Wrote module: audo")
+            time.sleep(0.3)
+
    def writeConfig(self, config_name):
        """Write the current (edited) localConfig to the device"""
        if self.localConfig is None:
@@ -216,6 +223,8 @@ class Node:
            p.set_module_config.telemetry.CopyFrom(self.moduleConfig.telemetry)
        elif config_name == 'canned_message':
            p.set_module_config.canned_message.CopyFrom(self.moduleConfig.canned_message)
+        elif config_name == 'audio':
+            p.set_module_config.audio.CopyFrom(self.moduleConfig.audio)
        else:
            our_exit(f"Error: No valid config with name {config_name}")
        
@@ -290,38 +299,30 @@ class Node:
    def setOwner(self, long_name=None, short_name=None, is_licensed=False):
        """Set device owner name"""
        logging.debug(f"in setOwner nodeNum:{self.nodeNum}")
-        nChars = 3
-        minChars = 2
-        if long_name is not None:
-            long_name = long_name.strip()
-            if short_name is None:
-                words = long_name.split()
-                if len(long_name) <= nChars:
-                    short_name = long_name
-                elif len(words) >= minChars:
-                    short_name = ''.join(map(lambda word: word[0], words))
-                else:
-                    trans = str.maketrans(dict.fromkeys('aeiouAEIOU'))
-                    short_name = long_name[0] + long_name[1:].translate(trans)
-                    if len(short_name) < nChars:
-                        short_name = long_name[:nChars]
-
        p = admin_pb2.AdminMessage()

+        nChars = 4
        if long_name is not None:
+            long_name = long_name.strip()
            p.set_owner.long_name = long_name
+            p.set_owner.is_licensed = is_licensed
        if short_name is not None:
            short_name = short_name.strip()
            if len(short_name) > nChars:
                short_name = short_name[:nChars]
+                print(f"Maximum is 4 characters, truncated to {short_name}")
            p.set_owner.short_name = short_name
-            p.set_owner.is_licensed = is_licensed

        # Note: These debug lines are used in unit tests
        logging.debug(f'p.set_owner.long_name:{p.set_owner.long_name}:')
        logging.debug(f'p.set_owner.short_name:{p.set_owner.short_name}:')
        logging.debug(f'p.set_owner.is_licensed:{p.set_owner.is_licensed}')
-        return self._sendAdmin(p)
+        # If sending to a remote node, wait for ACK/NAK
+        if self == self.iface.localNode:
+            onResponse = None
+        else: 
+            onResponse = self.onAckNak
+        return self._sendAdmin(p, onResponse=onResponse)

    def getURL(self, includeAll: bool = True):
        """The sharable URL that describes the current channel"""
@@ -336,14 +337,14 @@ class Node:
        some_bytes = channelSet.SerializeToString()
        s = base64.urlsafe_b64encode(some_bytes).decode('ascii')
        s = s.replace("=", "").replace("+", "-").replace("/", "_")
-        return f"https://www.meshtastic.org/e/#{s}"
+        return f"https://meshtastic.org/e/#{s}"

    def setURL(self, url):
        """Set mesh network URL"""
        if self.localConfig is None:
            our_exit("Warning: No Config has been read")

-        # URLs are of the form https://www.meshtastic.org/d/#{base64_channel_set}
+        # URLs are of the form https://meshtastic.org/d/#{base64_channel_set}
        # Split on '/#' to find the base64 encoded channel settings
        splitURL = url.split("/#")
        b64 = splitURL[-1]
@@ -439,7 +440,12 @@ class Node:
                p.set_canned_message_module_messages = chunk

            logging.debug(f"Setting canned message '{chunk}' part {i+1}")
-            self._sendAdmin(p)
+            # If sending to a remote node, wait for ACK/NAK
+            if self == self.iface.localNode:
+                onResponse = None
+            else: 
+                onResponse = self.onAckNak
+            return self._sendAdmin(p, onResponse=onResponse)

    def exitSimulator(self):
        """Tell a simulator node to exit (this message
@@ -456,7 +462,38 @@ class Node:
        p.reboot_seconds = secs
        logging.info(f"Telling node to reboot in {secs} seconds")

-        return self._sendAdmin(p)
+        # If sending to a remote node, wait for ACK/NAK
+        if self == self.iface.localNode:
+            onResponse = None
+        else: 
+            onResponse = self.onAckNak
+        return self._sendAdmin(p, onResponse=onResponse)
+    
+    def beginSettingsTransaction(self):
+        """Tell the node to open a transaction to edit settings."""
+        p = admin_pb2.AdminMessage()
+        p.begin_edit_settings = True
+        logging.info(f"Telling open a transaction to edit settings")
+
+        # If sending to a remote node, wait for ACK/NAK
+        if self == self.iface.localNode:
+            onResponse = None
+        else: 
+            onResponse = self.onAckNak
+        return self._sendAdmin(p, onResponse=onResponse)
+
+    def commitSettingsTransaction(self):
+        """Tell the node to commit the open transaction for editing settings."""
+        p = admin_pb2.AdminMessage()
+        p.commit_edit_settings = True
+        logging.info(f"Telling node to commit open transaction for editing settings")
+
+        # If sending to a remote node, wait for ACK/NAK
+        if self == self.iface.localNode:
+            onResponse = None
+        else: 
+            onResponse = self.onAckNak
+        return self._sendAdmin(p, onResponse=onResponse)

    def rebootOTA(self, secs: int = 10):
        """Tell the node to reboot into factory firmware."""
@@ -464,7 +501,12 @@ class Node:
        p.reboot_ota_seconds = secs
        logging.info(f"Telling node to reboot to OTA in {secs} seconds")

-        return self._sendAdmin(p)        
+        # If sending to a remote node, wait for ACK/NAK
+        if self == self.iface.localNode:
+            onResponse = None
+        else: 
+            onResponse = self.onAckNak
+        return self._sendAdmin(p, onResponse=onResponse)        

    def shutdown(self, secs: int = 10):
        """Tell the node to shutdown."""
@@ -472,10 +514,15 @@ class Node:
        p.shutdown_seconds = secs
        logging.info(f"Telling node to shutdown in {secs} seconds")

-        return self._sendAdmin(p)
+        # If sending to a remote node, wait for ACK/NAK
+        if self == self.iface.localNode:
+            onResponse = None
+        else: 
+            onResponse = self.onAckNak
+        return self._sendAdmin(p, onResponse=onResponse)

-    def getMetadata(self, secs: int = 10):
-        """Tell the node to shutdown."""
+    def getMetadata(self):
+        """Get the node's metadata."""
        p = admin_pb2.AdminMessage()
        p.get_device_metadata_request = True
        logging.info(f"Requesting device metadata")
@@ -488,7 +535,12 @@ class Node:
        p.factory_reset = True
        logging.info(f"Telling node to factory reset")

-        return self._sendAdmin(p)   
+        # If sending to a remote node, wait for ACK/NAK
+        if self == self.iface.localNode:
+            onResponse = None
+        else: 
+            onResponse = self.onAckNak
+        return self._sendAdmin(p, onResponse=onResponse)  

    def resetNodeDb(self):
        """Tell the node to reset its list of nodes."""
@@ -496,7 +548,12 @@ class Node:
        p.nodedb_reset = True
        logging.info(f"Telling node to reset the NodeDB")

-        return self._sendAdmin(p)
+        # If sending to a remote node, wait for ACK/NAK
+        if self == self.iface.localNode:
+            onResponse = None
+        else: 
+            onResponse = self.onAckNak
+        return self._sendAdmin(p, onResponse=onResponse)

    def _fixupChannels(self):
        """Fixup indexes and add disabled channels as needed"""
@@ -551,7 +608,7 @@ class Node:
                return # Don't try to parse this routing message
            lastTried = 0
            if len(self.partialChannels) > 0:
-                lastTried = self.partialChannels[-1]
+                lastTried = self.partialChannels[-1].index
            logging.debug(f"Retrying previous channel request.")
            self._requestChannel(lastTried)
            return
@@ -580,6 +637,18 @@ class Node:
        else:
            self._requestChannel(index + 1)

+    def onAckNak(self, p):
+        if p["decoded"]["routing"]["errorReason"] != "NONE":
+            print(f'Received a NAK, error reason: {p["decoded"]["routing"]["errorReason"]}')
+            self.iface._acknowledgment.receivedNak = True
+        else: 
+            if int(p["from"]) == self.iface.localNode.nodeNum:
+              print(f'Received an implicit ACK. Packet will likely arrive, but cannot be guaranteed.')
+              self.iface._acknowledgment.receivedImplAck = True
+            else: 
+              print(f'Received an ACK.')
+              self.iface._acknowledgment.receivedAck = True
+            
    def _requestChannel(self, channelNum: int):
        """Done with initial config messages, now send regular
           MeshPackets to ask for settings"""
@@ -597,7 +666,7 @@ class Node:


    # pylint: disable=R1710
-    def _sendAdmin(self, p: admin_pb2.AdminMessage, wantResponse=False,
+    def _sendAdmin(self, p: admin_pb2.AdminMessage, wantResponse=True,
                   onResponse=None, adminIndex=0):
        """Send an admin message to the specified node (or the local node if destNodeNum is zero)"""

@@ -607,10 +676,10 @@ class Node:
            if adminIndex == 0:  # unless a special channel index was used, we want to use the admin index
                adminIndex = self.iface.localNode._getAdminChannelIndex()
            logging.debug(f'adminIndex:{adminIndex}')
-
+            
            return self.iface.sendData(p, self.nodeNum,
                                       portNum=portnums_pb2.PortNum.ADMIN_APP,
-                                       wantAck=True,
+                                       wantAck=False,
                                       wantResponse=wantResponse,
                                       onResponse=onResponse,
                                       channelIndex=adminIndex)
--- a/meshtastic/portnums_pb2.py
+++ b/meshtastic/portnums_pb2.py
@@ -15,7 +15,7 @@ _sym_db = _symbol_database.Default()



-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0eportnums.proto*\x81\x03\n\x07PortNum\x12\x0f\n\x0bUNKNOWN_APP\x10\x00\x12\x14\n\x10TEXT_MESSAGE_APP\x10\x01\x12\x17\n\x13REMOTE_HARDWARE_APP\x10\x02\x12\x10\n\x0cPOSITION_APP\x10\x03\x12\x10\n\x0cNODEINFO_APP\x10\x04\x12\x0f\n\x0bROUTING_APP\x10\x05\x12\r\n\tADMIN_APP\x10\x06\x12\x1f\n\x1bTEXT_MESSAGE_COMPRESSED_APP\x10\x07\x12\x10\n\x0cWAYPOINT_APP\x10\x08\x12\r\n\tREPLY_APP\x10 \x12\x11\n\rIP_TUNNEL_APP\x10!\x12\x0e\n\nSERIAL_APP\x10@\x12\x15\n\x11STORE_FORWARD_APP\x10\x41\x12\x12\n\x0eRANGE_TEST_APP\x10\x42\x12\x11\n\rTELEMETRY_APP\x10\x43\x12\x0b\n\x07ZPS_APP\x10\x44\x12\x11\n\rSIMULATOR_APP\x10\x45\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\x45\n\x13\x63om.geeksville.meshB\x08PortnumsH\x03Z\"github.com/meshtastic/go/generatedb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0eportnums.proto*\xa4\x03\n\x07PortNum\x12\x0f\n\x0bUNKNOWN_APP\x10\x00\x12\x14\n\x10TEXT_MESSAGE_APP\x10\x01\x12\x17\n\x13REMOTE_HARDWARE_APP\x10\x02\x12\x10\n\x0cPOSITION_APP\x10\x03\x12\x10\n\x0cNODEINFO_APP\x10\x04\x12\x0f\n\x0bROUTING_APP\x10\x05\x12\r\n\tADMIN_APP\x10\x06\x12\x1f\n\x1bTEXT_MESSAGE_COMPRESSED_APP\x10\x07\x12\x10\n\x0cWAYPOINT_APP\x10\x08\x12\r\n\tAUDIO_APP\x10\t\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\x11\n\rSIMULATOR_APP\x10\x45\x12\x12\n\x0eTRACEROUTE_APP\x10\x46\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\\\n\x13\x63om.geeksville.meshB\x08PortnumsH\x03Z\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufsb\x06proto3')

 _PORTNUM = DESCRIPTOR.enum_types_by_name['PortNum']
 PortNum = enum_type_wrapper.EnumTypeWrapper(_PORTNUM)
@@ -28,6 +28,7 @@ ROUTING_APP = 5
 ADMIN_APP = 6
 TEXT_MESSAGE_COMPRESSED_APP = 7
 WAYPOINT_APP = 8
+AUDIO_APP = 9
 REPLY_APP = 32
 IP_TUNNEL_APP = 33
 SERIAL_APP = 64
@@ -36,6 +37,7 @@ RANGE_TEST_APP = 66
 TELEMETRY_APP = 67
 ZPS_APP = 68
 SIMULATOR_APP = 69
+TRACEROUTE_APP = 70
 PRIVATE_APP = 256
 ATAK_FORWARDER = 257
 MAX = 511
@@ -44,7 +46,7 @@ MAX = 511
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\010PortnumsH\003Z\"github.com/meshtastic/go/generated'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\010PortnumsH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
  _PORTNUM._serialized_start=19
-  _PORTNUM._serialized_end=404
+  _PORTNUM._serialized_end=439
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/remote_hardware.py
+++ b/meshtastic/remote_hardware.py
@@ -23,7 +23,7 @@ def onGPIOreceive(packet, interface):

    #print(f'mask:{interface.mask}')
    value = int(gpioValue) & int(interface.mask)
-    print(f'Received RemoteHardware typ={hw["typ"]}, gpio_value={gpioValue} value={value}')
+    print(f'Received RemoteHardware type={hw["type"]}, gpio_value={gpioValue} value={value}')
    interface.gotResponse = True


@@ -66,7 +66,7 @@ class RemoteHardwareClient:
        """
        logging.debug(f'writeGPIOs nodeid:{nodeid} mask:{mask} vals:{vals}')
        r = remote_hardware_pb2.HardwareMessage()
-        r.typ = remote_hardware_pb2.HardwareMessage.Type.WRITE_GPIOS
+        r.type = remote_hardware_pb2.HardwareMessage.Type.WRITE_GPIOS
        r.gpio_mask = mask
        r.gpio_value = vals
        return self._sendHardware(nodeid, r)
@@ -75,7 +75,7 @@ class RemoteHardwareClient:
        """Read the specified bits from GPIO inputs on the device"""
        logging.debug(f'readGPIOs nodeid:{nodeid} mask:{mask}')
        r = remote_hardware_pb2.HardwareMessage()
-        r.typ = remote_hardware_pb2.HardwareMessage.Type.READ_GPIOS
+        r.type = remote_hardware_pb2.HardwareMessage.Type.READ_GPIOS
        r.gpio_mask = mask
        return self._sendHardware(nodeid, r, wantResponse=True, onResponse=onResponse)

@@ -83,7 +83,7 @@ class RemoteHardwareClient:
        """Watch the specified bits from GPIO inputs on the device for changes"""
        logging.debug(f'watchGPIOs nodeid:{nodeid} mask:{mask}')
        r = remote_hardware_pb2.HardwareMessage()
-        r.typ = remote_hardware_pb2.HardwareMessage.Type.WATCH_GPIOS
+        r.type = remote_hardware_pb2.HardwareMessage.Type.WATCH_GPIOS
        r.gpio_mask = mask
        self.iface.mask = mask
        return self._sendHardware(nodeid, r)
--- a/meshtastic/remote_hardware_pb2.py
+++ b/meshtastic/remote_hardware_pb2.py
@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()



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



@@ -30,7 +30,7 @@ _sym_db.RegisterMessage(HardwareMessage)
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016RemoteHardwareH\003Z\"github.com/meshtastic/go/generated'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016RemoteHardwareH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
  _HARDWAREMESSAGE._serialized_start=26
  _HARDWAREMESSAGE._serialized_end=229
  _HARDWAREMESSAGE_TYPE._serialized_start=121
--- a/meshtastic/storeforward_pb2.py
+++ b/meshtastic/storeforward_pb2.py
@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()



-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12storeforward.proto\"\x8a\x06\n\x0fStoreAndForward\x12,\n\x02rr\x18\x01 \x01(\x0e\x32 .StoreAndForward.RequestResponse\x12*\n\x05stats\x18\x02 \x01(\x0b\x32\x1b.StoreAndForward.Statistics\x12)\n\x07history\x18\x03 \x01(\x0b\x32\x18.StoreAndForward.History\x12-\n\theartbeat\x18\x04 \x01(\x0b\x32\x1a.StoreAndForward.Heartbeat\x1a\xcd\x01\n\nStatistics\x12\x16\n\x0emessages_total\x18\x01 \x01(\r\x12\x16\n\x0emessages_saved\x18\x02 \x01(\r\x12\x14\n\x0cmessages_max\x18\x03 \x01(\r\x12\x0f\n\x07up_time\x18\x04 \x01(\r\x12\x10\n\x08requests\x18\x05 \x01(\r\x12\x18\n\x10requests_history\x18\x06 \x01(\r\x12\x11\n\theartbeat\x18\x07 \x01(\x08\x12\x12\n\nreturn_max\x18\x08 \x01(\r\x12\x15\n\rreturn_window\x18\t \x01(\r\x1aI\n\x07History\x12\x18\n\x10history_messages\x18\x01 \x01(\r\x12\x0e\n\x06window\x18\x02 \x01(\r\x12\x14\n\x0clast_request\x18\x03 \x01(\r\x1a.\n\tHeartbeat\x12\x0e\n\x06period\x18\x01 \x01(\r\x12\x11\n\tsecondary\x18\x02 \x01(\r\"\xf7\x01\n\x0fRequestResponse\x12\t\n\x05UNSET\x10\x00\x12\x10\n\x0cROUTER_ERROR\x10\x01\x12\x14\n\x10ROUTER_HEARTBEAT\x10\x02\x12\x0f\n\x0bROUTER_PING\x10\x03\x12\x0f\n\x0bROUTER_PONG\x10\x04\x12\x0f\n\x0bROUTER_BUSY\x10\x05\x12\x12\n\x0eROUTER_HISTORY\x10\x06\x12\x10\n\x0c\x43LIENT_ERROR\x10\x65\x12\x12\n\x0e\x43LIENT_HISTORY\x10\x66\x12\x10\n\x0c\x43LIENT_STATS\x10g\x12\x0f\n\x0b\x43LIENT_PING\x10h\x12\x0f\n\x0b\x43LIENT_PONG\x10i\x12\x10\n\x0c\x43LIENT_ABORT\x10jBR\n\x13\x63om.geeksville.meshB\x15StoreAndForwardProtosH\x03Z\"github.com/meshtastic/go/generatedb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12storeforward.proto\"\xbe\x06\n\x0fStoreAndForward\x12,\n\x02rr\x18\x01 \x01(\x0e\x32 .StoreAndForward.RequestResponse\x12,\n\x05stats\x18\x02 \x01(\x0b\x32\x1b.StoreAndForward.StatisticsH\x00\x12+\n\x07history\x18\x03 \x01(\x0b\x32\x18.StoreAndForward.HistoryH\x00\x12/\n\theartbeat\x18\x04 \x01(\x0b\x32\x1a.StoreAndForward.HeartbeatH\x00\x12\x0f\n\x05\x65mpty\x18\x05 \x01(\x08H\x00\x1a\xcd\x01\n\nStatistics\x12\x16\n\x0emessages_total\x18\x01 \x01(\r\x12\x16\n\x0emessages_saved\x18\x02 \x01(\r\x12\x14\n\x0cmessages_max\x18\x03 \x01(\r\x12\x0f\n\x07up_time\x18\x04 \x01(\r\x12\x10\n\x08requests\x18\x05 \x01(\r\x12\x18\n\x10requests_history\x18\x06 \x01(\r\x12\x11\n\theartbeat\x18\x07 \x01(\x08\x12\x12\n\nreturn_max\x18\x08 \x01(\r\x12\x15\n\rreturn_window\x18\t \x01(\r\x1aI\n\x07History\x12\x18\n\x10history_messages\x18\x01 \x01(\r\x12\x0e\n\x06window\x18\x02 \x01(\r\x12\x14\n\x0clast_request\x18\x03 \x01(\r\x1a.\n\tHeartbeat\x12\x0e\n\x06period\x18\x01 \x01(\r\x12\x11\n\tsecondary\x18\x02 \x01(\r\"\x89\x02\n\x0fRequestResponse\x12\t\n\x05UNSET\x10\x00\x12\x10\n\x0cROUTER_ERROR\x10\x01\x12\x14\n\x10ROUTER_HEARTBEAT\x10\x02\x12\x0f\n\x0bROUTER_PING\x10\x03\x12\x0f\n\x0bROUTER_PONG\x10\x04\x12\x0f\n\x0bROUTER_BUSY\x10\x05\x12\x12\n\x0eROUTER_HISTORY\x10\x06\x12\x10\n\x0cROUTER_STATS\x10\x07\x12\x10\n\x0c\x43LIENT_ERROR\x10@\x12\x12\n\x0e\x43LIENT_HISTORY\x10\x41\x12\x10\n\x0c\x43LIENT_STATS\x10\x42\x12\x0f\n\x0b\x43LIENT_PING\x10\x43\x12\x0f\n\x0b\x43LIENT_PONG\x10\x44\x12\x10\n\x0c\x43LIENT_ABORT\x10jB\t\n\x07variantBi\n\x13\x63om.geeksville.meshB\x15StoreAndForwardProtosH\x03Z\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufsb\x06proto3')



@@ -57,15 +57,15 @@ _sym_db.RegisterMessage(StoreAndForward.Heartbeat)
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\025StoreAndForwardProtosH\003Z\"github.com/meshtastic/go/generated'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\025StoreAndForwardProtosH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
  _STOREANDFORWARD._serialized_start=23
-  _STOREANDFORWARD._serialized_end=801
-  _STOREANDFORWARD_STATISTICS._serialized_start=223
-  _STOREANDFORWARD_STATISTICS._serialized_end=428
-  _STOREANDFORWARD_HISTORY._serialized_start=430
-  _STOREANDFORWARD_HISTORY._serialized_end=503
-  _STOREANDFORWARD_HEARTBEAT._serialized_start=505
-  _STOREANDFORWARD_HEARTBEAT._serialized_end=551
-  _STOREANDFORWARD_REQUESTRESPONSE._serialized_start=554
-  _STOREANDFORWARD_REQUESTRESPONSE._serialized_end=801
+  _STOREANDFORWARD._serialized_end=853
+  _STOREANDFORWARD_STATISTICS._serialized_start=246
+  _STOREANDFORWARD_STATISTICS._serialized_end=451
+  _STOREANDFORWARD_HISTORY._serialized_start=453
+  _STOREANDFORWARD_HISTORY._serialized_end=526
+  _STOREANDFORWARD_HEARTBEAT._serialized_start=528
+  _STOREANDFORWARD_HEARTBEAT._serialized_end=574
+  _STOREANDFORWARD_REQUESTRESPONSE._serialized_start=577
+  _STOREANDFORWARD_REQUESTRESPONSE._serialized_end=842
 # @@protoc_insertion_point(module_scope)
--- a/meshtastic/telemetry_pb2.py
+++ b/meshtastic/telemetry_pb2.py
@@ -15,7 +15,7 @@ _sym_db = _symbol_database.Default()



-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0ftelemetry.proto\"i\n\rDeviceMetrics\x12\x15\n\rbattery_level\x18\x01 \x01(\r\x12\x0f\n\x07voltage\x18\x02 \x01(\x02\x12\x1b\n\x13\x63hannel_utilization\x18\x03 \x01(\x02\x12\x13\n\x0b\x61ir_util_tx\x18\x04 \x01(\x02\"\x9b\x01\n\x12\x45nvironmentMetrics\x12\x13\n\x0btemperature\x18\x01 \x01(\x02\x12\x19\n\x11relative_humidity\x18\x02 \x01(\x02\x12\x1b\n\x13\x62\x61rometric_pressure\x18\x03 \x01(\x02\x12\x16\n\x0egas_resistance\x18\x04 \x01(\x02\x12\x0f\n\x07voltage\x18\x05 \x01(\x02\x12\x0f\n\x07\x63urrent\x18\x06 \x01(\x02\"\x82\x01\n\tTelemetry\x12\x0c\n\x04time\x18\x01 \x01(\x07\x12(\n\x0e\x64\x65vice_metrics\x18\x02 \x01(\x0b\x32\x0e.DeviceMetricsH\x00\x12\x32\n\x13\x65nvironment_metrics\x18\x03 \x01(\x0b\x32\x13.EnvironmentMetricsH\x00\x42\t\n\x07variant*\xa0\x01\n\x13TelemetrySensorType\x12\x10\n\x0cSENSOR_UNSET\x10\x00\x12\n\n\x06\x42ME280\x10\x01\x12\n\n\x06\x42ME680\x10\x02\x12\x0b\n\x07MCP9808\x10\x03\x12\n\n\x06INA260\x10\x04\x12\n\n\x06INA219\x10\x05\x12\n\n\x06\x42MP280\x10\x06\x12\t\n\x05SHTC3\x10\x07\x12\t\n\x05LPS22\x10\x08\x12\x0b\n\x07QMC6310\x10\t\x12\x0b\n\x07QMI8658\x10\nBL\n\x13\x63om.geeksville.meshB\x0fTelemetryProtosH\x03Z\"github.com/meshtastic/go/generatedb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0ftelemetry.proto\"i\n\rDeviceMetrics\x12\x15\n\rbattery_level\x18\x01 \x01(\r\x12\x0f\n\x07voltage\x18\x02 \x01(\x02\x12\x1b\n\x13\x63hannel_utilization\x18\x03 \x01(\x02\x12\x13\n\x0b\x61ir_util_tx\x18\x04 \x01(\x02\"\x9b\x01\n\x12\x45nvironmentMetrics\x12\x13\n\x0btemperature\x18\x01 \x01(\x02\x12\x19\n\x11relative_humidity\x18\x02 \x01(\x02\x12\x1b\n\x13\x62\x61rometric_pressure\x18\x03 \x01(\x02\x12\x16\n\x0egas_resistance\x18\x04 \x01(\x02\x12\x0f\n\x07voltage\x18\x05 \x01(\x02\x12\x0f\n\x07\x63urrent\x18\x06 \x01(\x02\"\x82\x01\n\tTelemetry\x12\x0c\n\x04time\x18\x01 \x01(\x07\x12(\n\x0e\x64\x65vice_metrics\x18\x02 \x01(\x0b\x32\x0e.DeviceMetricsH\x00\x12\x32\n\x13\x65nvironment_metrics\x18\x03 \x01(\x0b\x32\x13.EnvironmentMetricsH\x00\x42\t\n\x07variant*\xb9\x01\n\x13TelemetrySensorType\x12\x10\n\x0cSENSOR_UNSET\x10\x00\x12\n\n\x06\x42ME280\x10\x01\x12\n\n\x06\x42ME680\x10\x02\x12\x0b\n\x07MCP9808\x10\x03\x12\n\n\x06INA260\x10\x04\x12\n\n\x06INA219\x10\x05\x12\n\n\x06\x42MP280\x10\x06\x12\t\n\x05SHTC3\x10\x07\x12\t\n\x05LPS22\x10\x08\x12\x0b\n\x07QMC6310\x10\t\x12\x0b\n\x07QMI8658\x10\n\x12\x0c\n\x08QMC5883L\x10\x0b\x12\t\n\x05SHT31\x10\x0c\x42\x63\n\x13\x63om.geeksville.meshB\x0fTelemetryProtosH\x03Z\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufsb\x06proto3')

 _TELEMETRYSENSORTYPE = DESCRIPTOR.enum_types_by_name['TelemetrySensorType']
 TelemetrySensorType = enum_type_wrapper.EnumTypeWrapper(_TELEMETRYSENSORTYPE)
@@ -30,6 +30,8 @@ SHTC3 = 7
 LPS22 = 8
 QMC6310 = 9
 QMI8658 = 10
+QMC5883L = 11
+SHT31 = 12


 _DEVICEMETRICS = DESCRIPTOR.message_types_by_name['DeviceMetrics']
@@ -59,9 +61,9 @@ _sym_db.RegisterMessage(Telemetry)
 if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\017TelemetryProtosH\003Z\"github.com/meshtastic/go/generated'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\017TelemetryProtosH\003Z\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs'
  _TELEMETRYSENSORTYPE._serialized_start=418
-  _TELEMETRYSENSORTYPE._serialized_end=578
+  _TELEMETRYSENSORTYPE._serialized_end=603
  _DEVICEMETRICS._serialized_start=19
  _DEVICEMETRICS._serialized_end=124
  _ENVIRONMENTMETRICS._serialized_start=127
--- a/meshtastic/util.py
+++ b/meshtastic/util.py
@@ -159,6 +159,40 @@ class Timeout:
            time.sleep(self.sleepInterval)
        return False

+    def waitForAckNak(self, acknowledgment, attrs=('receivedAck', 'receivedNak', 'receivedImplAck')):
+        """Block until an ACK or NAK has been received. Returns True if ACK or NAK has been received."""
+        self.reset()
+        while time.time() < self.expireTime:
+            if any(map(lambda a: getattr(acknowledgment, a, None), attrs)):
+                acknowledgment.reset()
+                return True
+            time.sleep(self.sleepInterval)
+        return False
+
+    def waitForTraceRoute(self, waitFactor, acknowledgment, attr='receivedTraceRoute'):
+        """Block until traceroute response is received. Returns True if traceroute response has been received."""
+        self.expireTimeout *= waitFactor
+        self.reset()    
+        while time.time() < self.expireTime:
+            if getattr(acknowledgment, attr, None):
+                acknowledgment.reset()
+                return True
+            time.sleep(self.sleepInterval)
+        return False
+
+class Acknowledgment:
+    "A class that records which type of acknowledgment was just received, if any."
+    def __init__(self):
+      self.receivedAck = False
+      self.receivedNak = False
+      self.receivedImplAck = False
+      self.receivedTraceRoute = False
+
+    def reset(self):
+      self.receivedAck = False
+      self.receivedNak = False
+      self.receivedImplAck = False
+      self.receivedTraceRoute = False

 class DeferredExecution():
    """A thread that accepts closures to run, and runs them as they are received"""
--- 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="2.0.1",
+    version="2.0.7",
    description="Python API & client shell for talking to Meshtastic devices",
    long_description=long_description,
    long_description_content_type="text/markdown",
Author	SHA1	Message	Date
github-actions	af043ef5c0	Update protobuf submodule	2022-12-28 16:37:24 +00:00
github-actions	4f46858643	bump version	2022-12-27 21:23:16 +00:00
Thomas Göttgens	ddc47fb8de	Merge pull request #412 from meshtastic/remote-hardware tryfix remote hardware	2022-12-27 22:16:57 +01:00
Thomas Göttgens	7ee134b819	tryfix remote hardware	2022-12-27 21:32:25 +01:00
Ben Meadors	254e9f4015	Typos	2022-12-22 14:35:48 -06:00
mkinney	cc99ea009e	Update README.md fix codecoverage link	2022-12-20 11:00:01 -08:00
github-actions	76407e11f8	bump version	2022-12-06 14:44:31 +00:00
Thomas Göttgens	57719ddd5e	Merge pull request #407 from GUVWAF/traceRoute Traceroute option	2022-12-06 15:36:49 +01:00
GUVWAF	d0b8b9ff1b	Forgot to convert into TRACEROUTE_APP	2022-12-06 14:18:30 +01:00
github-actions	c5c9723208	Update protobuf submodule	2022-12-06 13:16:28 +00:00
Ben Meadors	9bceaafd9c	Merge pull request #406 from GUVWAF/hopLimit Set hopLimit to the config of the device	2022-12-05 20:10:27 -06:00
GUVWAF	7d3a9178ea	Add traceroute option	2022-12-05 20:36:34 +01:00
GUVWAF	2c76c0cafa	Remove setting hopLimit to default Instead set is to config of device	2022-12-05 20:04:38 +01:00
GUVWAF	82977e9ef2	Fix --ch-set help message	2022-12-05 20:02:53 +01:00
Sacha Weatherstone	7a9c25da8e	Merge pull request #404 from ahmedkadd/fix-script-typo Rename protobufs shell script to fix typo	2022-12-02 14:39:18 +11:00
Ahmed Kaddoura	342c48fb16	Rename protobufs shell script to fix typo	2022-11-30 07:58:56 -08:00
github-actions	6bc955a403	bump version	2022-11-27 12:10:59 +00:00
Ben Meadors	741ba378ab	Merge pull request #402 from GUVWAF/wantResponse Only set wantResponse for admin packets	2022-11-27 06:10:01 -06:00
GUVWAF	c1054caf4a	Only set wantResponse for admin packets	2022-11-27 12:44:58 +01:00
Ben Meadors	24b97d9277	Merge pull request #401 from GUVWAF/setowner Remove automatic short owner naming and increase to 4 characters	2022-11-26 07:56:34 -06:00
GUVWAF	868fb64857	Only set is_licensed if long_name is set	2022-11-26 11:08:00 +01:00
GUVWAF	8729e97e1b	Remove automatic short owner naming and increase to 4 characters	2022-11-26 10:52:20 +01:00
github-actions	aaed54393e	bump version	2022-11-22 17:03:56 +00:00
Ben Meadors	d12776bb5f	Merge pull request #400 from meshtastic/transaction-for-config Transactions for editing settings	2022-11-21 15:27:31 -06:00
Ben Meadors	7829f6afca	Args	2022-11-20 20:01:50 -06:00
Ben Meadors	4bd10bc102	Add begin / edit transactions for setting updates	2022-11-20 19:46:43 -06:00
Ben Meadors	3821e02f09	Update protos	2022-11-20 19:11:38 -06:00
Ben Meadors	97689da0b4	Merge pull request #395 from GUVWAF/master Change how admin packets to remote nodes are handled	2022-11-19 15:36:33 -06:00
GUVWAF	5c75e74bf9	Don't request config and channels if not needed. Instead, wait for an (implicit) ACK or NAK. Applies to admin packets set-owner, reboot, shutdown, factory-reset and reset-nodedb.	2022-11-19 21:19:06 +01:00
GUVWAF	388a46abf4	Merge branch 'meshtastic:master' into master	2022-11-15 13:26:30 +01:00
github-actions	6b89fc81a1	bump version	2022-11-10 03:23:52 +00:00
Ben Meadors	c9b5d5d697	Update protos and add audio	2022-11-09 21:20:38 -06:00
Ben Meadors	f16dd0e737	Update url	2022-11-08 18:25:49 -06:00
Ben Meadors	5ed19eff73	Create cleanup_artifacts.yml	2022-11-05 06:52:28 -05:00
github-actions	0b3605141d	bump version	2022-11-03 13:02:34 +00:00
GUVWAF	f1df14ca92	lastTried channel should be its index	2022-11-03 09:28:15 +01:00
Ben Meadors	83776ceec5	Fix url	2022-11-02 21:20:25 -05:00
GUVWAF	7aff5e9ee5	Unset wantAck if you set wantResponse for Admin	2022-11-02 09:49:20 +01:00