From 055da95b8aa10049b50e03e14ac09cf8a56e7dbc Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Tue, 25 Jul 2023 19:46:17 -0500 Subject: [PATCH] Update protos and remove old max_channels check --- meshtastic/mesh_interface.py | 7 ------- meshtastic/portnums_pb2.py | 5 ++--- protobufs | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/meshtastic/mesh_interface.py b/meshtastic/mesh_interface.py index 8b99daf..0588db6 100644 --- a/meshtastic/mesh_interface.py +++ b/meshtastic/mesh_interface.py @@ -704,13 +704,6 @@ class MeshInterface: "For more information see https://tinyurl.com/5bjsxu32" ) - # check for firmware too old - if self.myInfo.max_channels == 0: - failmsg = ( - "This version of meshtastic-python requires device firmware version 1.2 or later. " - "For more information see https://tinyurl.com/5bjsxu32" - ) - if failmsg: self.failure = Exception(failmsg) self.isConnected.set() # let waitConnected return this exception diff --git a/meshtastic/portnums_pb2.py b/meshtastic/portnums_pb2.py index ad20812..3b1c7ad 100644 --- 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\x19meshtastic/portnums.proto*\xd5\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\x19\n\x15MQTT_CLIENT_PROXY_APP\x10\n\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\x14\n\x10NEIGHBORINFO_APP\x10G\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\x08PortnumsZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19meshtastic/portnums.proto*\xba\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\x14\n\x10NEIGHBORINFO_APP\x10G\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\x08PortnumsZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3') _PORTNUM = DESCRIPTOR.enum_types_by_name['PortNum'] PortNum = enum_type_wrapper.EnumTypeWrapper(_PORTNUM) @@ -29,7 +29,6 @@ ADMIN_APP = 6 TEXT_MESSAGE_COMPRESSED_APP = 7 WAYPOINT_APP = 8 AUDIO_APP = 9 -MQTT_CLIENT_PROXY_APP = 10 REPLY_APP = 32 IP_TUNNEL_APP = 33 SERIAL_APP = 64 @@ -50,5 +49,5 @@ if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\010PortnumsZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000' _PORTNUM._serialized_start=30 - _PORTNUM._serialized_end=499 + _PORTNUM._serialized_end=472 # @@protoc_insertion_point(module_scope) diff --git a/protobufs b/protobufs index e0b136f..57bd75e 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit e0b136f5f8e26094d02c28d1fdcacd61e087298c +Subproject commit 57bd75ea8b3c4fe551dcaf1dcd402646878176a8