1.1.46

2026-01-02 12:57:56 -05:00 · 2021-02-13 14:11:48 +08:00
parent 778341837b
commit 6b6f0cd19d
9 changed files with 249 additions and 88 deletions
--- a/README.md
+++ b/README.md
@@ -105,5 +105,5 @@ sudo usermod -a -G dialout <username>
 If you need to build a new release you'll need:
 ```
 apt install pandoc
-sudo pip3 install markdown pandoc webencodings pyparsing
+sudo pip3 install markdown pandoc webencodings pyparsing twine
 ```
--- a/docs/meshtastic/mesh_pb2.html
+++ b/docs/meshtastic/mesh_pb2.html
--- a/docs/meshtastic/portnums_pb2.html
+++ b/docs/meshtastic/portnums_pb2.html
@@ -47,7 +47,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
  package=&#39;&#39;,
  syntax=&#39;proto3&#39;,
  serialized_options=b&#39;\n\023com.geeksville.meshB\010PortnumsH\003&#39;,
-  serialized_pb=b&#39;\n\x0eportnums.proto*\xdd\x01\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\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\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x42!\n\x13\x63om.geeksville.meshB\x08PortnumsH\x03\x62\x06proto3&#39;
+  serialized_pb=b&#39;\n\x0eportnums.proto*\xf1\x01\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\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\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x42!\n\x13\x63om.geeksville.meshB\x08PortnumsH\x03\x62\x06proto3&#39;
 )

 _PORTNUM = _descriptor.EnumDescriptor(
@@ -93,18 +93,22 @@ _PORTNUM = _descriptor.EnumDescriptor(
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name=&#39;PRIVATE_APP&#39;, index=9, number=256,
+      name=&#39;RANGE_TEST_APP&#39;, index=9, number=66,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name=&#39;ATAK_FORWARDER&#39;, index=10, number=257,
+      name=&#39;PRIVATE_APP&#39;, index=10, number=256,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name=&#39;ATAK_FORWARDER&#39;, index=11, number=257,
      serialized_options=None,
      type=None),
  ],
  containing_type=None,
  serialized_options=None,
  serialized_start=19,
-  serialized_end=240,
+  serialized_end=260,
 )
 _sym_db.RegisterEnumDescriptor(_PORTNUM)

@@ -118,6 +122,7 @@ REPLY_APP = 32
 IP_TUNNEL_APP = 33
 SERIAL_APP = 64
 STORE_FORWARD_APP = 65
+RANGE_TEST_APP = 66
 PRIVATE_APP = 256
 ATAK_FORWARDER = 257

--- a/docs/meshtastic/test.html
+++ b/docs/meshtastic/test.html
@@ -123,7 +123,7 @@ def testThread(numTests=50):
                f&#34;Test failed, expected packet not received ({numFail} failures so far)&#34;)
        else:
            numSuccess = numSuccess + 1
-            logging.info(f&#34;Test succeeded ({numSuccess} successes so far)&#34;)
+            logging.info(f&#34;Test succeeded ({numSuccess} successes ({numFail} failures) so far)&#34;)

        if numFail &gt;= 3:
            for i in interfaces:
@@ -375,7 +375,7 @@ toInterface {[type]} &ndash; [description]</p>
                f&#34;Test failed, expected packet not received ({numFail} failures so far)&#34;)
        else:
            numSuccess = numSuccess + 1
-            logging.info(f&#34;Test succeeded ({numSuccess} successes so far)&#34;)
+            logging.info(f&#34;Test succeeded ({numSuccess} successes ({numFail} failures) so far)&#34;)

        if numFail &gt;= 3:
            for i in interfaces:
--- a/meshtastic/mesh_pb2.py
+++ b/meshtastic/mesh_pb2.py
--- a/meshtastic/portnums_pb2.py
+++ b/meshtastic/portnums_pb2.py
@@ -19,7 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
  package='',
  syntax='proto3',
  serialized_options=b'\n\023com.geeksville.meshB\010PortnumsH\003',
-  serialized_pb=b'\n\x0eportnums.proto*\xdd\x01\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\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\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x42!\n\x13\x63om.geeksville.meshB\x08PortnumsH\x03\x62\x06proto3'
+  serialized_pb=b'\n\x0eportnums.proto*\xf1\x01\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\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\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x42!\n\x13\x63om.geeksville.meshB\x08PortnumsH\x03\x62\x06proto3'
 )

 _PORTNUM = _descriptor.EnumDescriptor(
@@ -65,18 +65,22 @@ _PORTNUM = _descriptor.EnumDescriptor(
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='PRIVATE_APP', index=9, number=256,
+      name='RANGE_TEST_APP', index=9, number=66,
      serialized_options=None,
      type=None),
    _descriptor.EnumValueDescriptor(
-      name='ATAK_FORWARDER', index=10, number=257,
+      name='PRIVATE_APP', index=10, number=256,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ATAK_FORWARDER', index=11, number=257,
      serialized_options=None,
      type=None),
  ],
  containing_type=None,
  serialized_options=None,
  serialized_start=19,
-  serialized_end=240,
+  serialized_end=260,
 )
 _sym_db.RegisterEnumDescriptor(_PORTNUM)

@@ -90,6 +94,7 @@ REPLY_APP = 32
 IP_TUNNEL_APP = 33
 SERIAL_APP = 64
 STORE_FORWARD_APP = 65
+RANGE_TEST_APP = 66
 PRIVATE_APP = 256
 ATAK_FORWARDER = 257

--- a/meshtastic/test.py
+++ b/meshtastic/test.py
@@ -95,7 +95,7 @@ def testThread(numTests=50):
                f"Test failed, expected packet not received ({numFail} failures so far)")
        else:
            numSuccess = numSuccess + 1
-            logging.info(f"Test succeeded ({numSuccess} successes so far)")
+            logging.info(f"Test succeeded ({numSuccess} successes ({numFail} failures) so far)")

        if numFail >= 3:
            for i in interfaces:
--- 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.1.45",
+    version="1.1.46",
    description="Python API & client shell for talking to Meshtastic devices",
    long_description=long_description,
    long_description_content_type="text/markdown",