Merge pull request #443 from GUVWAF/master

Option to wait for ACK after --sendtext

meshtastic/__main__.py

@@ -383,7 +383,11 @@ def onConnected(interface):
                     f"Sending text message {args.sendtext} to {args.dest} on channelIndex:{channelIndex}"
                 )
                 interface.sendText(
-                    args.sendtext, args.dest, wantAck=True, channelIndex=channelIndex
+                    args.sendtext,
+                    args.dest,
+                    wantAck=True,
+                    channelIndex=channelIndex,
+                    onResponse=interface.getNode(args.dest, False).onAckNak,
                 )
             else:
                 meshtastic.util.our_exit(
@@ -762,7 +766,7 @@ def onConnected(interface):
             else:
                 tunnel.Tunnel(interface, subnet=args.tunnel_net)
 
-        if args.dest != BROADCAST_ADDR and waitForAckNak:
+        if args.ack or (args.dest != BROADCAST_ADDR and waitForAckNak):
             print(
                 f"Waiting for an acknowledgment from remote node (this could take a while)"
             )
@@ -1183,6 +1187,12 @@ def initParser():
         "Only nodes that have the encryption key can be traced.",
     )
 
+    parser.add_argument(
+        "--ack",
+        help="Use in combination with --sendtext to wait for an acknowledgment.",
+        action="store_true",
+    )
+
     parser.add_argument(
         "--reboot", help="Tell the destination node to reboot", action="store_true"
     )

meshtastic/clientonly_pb2.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: meshtastic/clientonly.proto
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from meshtastic import localonly_pb2 as meshtastic_dot_localonly__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bmeshtastic/clientonly.proto\x1a\x1ameshtastic/localonly.proto\"\xf7\x01\n\rDeviceProfile\x12\x16\n\tlong_name\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x17\n\nshort_name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x18\n\x0b\x63hannel_url\x18\x03 \x01(\tH\x02\x88\x01\x01\x12!\n\x06\x63onfig\x18\x04 \x01(\x0b\x32\x0c.LocalConfigH\x03\x88\x01\x01\x12.\n\rmodule_config\x18\x05 \x01(\x0b\x32\x12.LocalModuleConfigH\x04\x88\x01\x01\x42\x0c\n\n_long_nameB\r\n\x0b_short_nameB\x0e\n\x0c_channel_urlB\t\n\x07_configB\x10\n\x0e_module_configBe\n\x13\x63om.geeksville.meshB\x10\x43lientOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+
+
+
+_DEVICEPROFILE = DESCRIPTOR.message_types_by_name['DeviceProfile']
+DeviceProfile = _reflection.GeneratedProtocolMessageType('DeviceProfile', (_message.Message,), {
+  'DESCRIPTOR' : _DEVICEPROFILE,
+  '__module__' : 'meshtastic.clientonly_pb2'
+  # @@protoc_insertion_point(class_scope:DeviceProfile)
+  })
+_sym_db.RegisterMessage(DeviceProfile)
+
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\020ClientOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _DEVICEPROFILE._serialized_start=60
+  _DEVICEPROFILE._serialized_end=307
+# @@protoc_insertion_point(module_scope)

setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r") as fh:
 # This call to setup() does all the work
 setup(
     name="meshtastic",
-    version="2.1.4",
+    version="2.1.5",
     description="Python API & client shell for talking to Meshtastic devices",
     long_description=long_description,
     long_description_content_type="text/markdown",