diff --git a/.gitignore b/.gitignore index 35fef00..4b440b0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ log_* nanopb-0.4.4 .*swp .coverage +*.py-E diff --git a/meshtastic/admin_pb2.py b/meshtastic/admin_pb2.py index f5b8cab..f809323 100644 --- a/meshtastic/admin_pb2.py +++ b/meshtastic/admin_pb2.py @@ -11,9 +11,9 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() +from . import channel_pb2 as channel__pb2 from . import mesh_pb2 as mesh__pb2 from . import radioconfig_pb2 as radioconfig__pb2 -from . import channel_pb2 as channel__pb2 DESCRIPTOR = _descriptor.FileDescriptor( @@ -21,9 +21,9 @@ DESCRIPTOR = _descriptor.FileDescriptor( package='', syntax='proto3', serialized_options=b'\n\023com.geeksville.meshB\013AdminProtosH\003Z!github.com/meshtastic/gomeshproto', - serialized_pb=b'\n\x0b\x61\x64min.proto\x1a\nmesh.proto\x1a\x11radioconfig.proto\x1a\rchannel.proto\"\xfb\x02\n\x0c\x41\x64minMessage\x12!\n\tset_radio\x18\x01 \x01(\x0b\x32\x0c.RadioConfigH\x00\x12\x1a\n\tset_owner\x18\x02 \x01(\x0b\x32\x05.UserH\x00\x12\x1f\n\x0bset_channel\x18\x03 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_radio_request\x18\x04 \x01(\x08H\x00\x12*\n\x12get_radio_response\x18\x05 \x01(\x0b\x32\x0c.RadioConfigH\x00\x12\x1d\n\x13get_channel_request\x18\x06 \x01(\rH\x00\x12(\n\x14get_channel_response\x18\x07 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1d\n\x13\x63onfirm_set_channel\x18 \x01(\x08H\x00\x12\x1b\n\x11\x63onfirm_set_radio\x18! \x01(\x08H\x00\x12\x18\n\x0e\x65xit_simulator\x18\" \x01(\x08H\x00\x12\x18\n\x0ereboot_seconds\x18# \x01(\x05H\x00\x42\t\n\x07variantBG\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' + serialized_pb=b'\n\x0b\x61\x64min.proto\x1a\rchannel.proto\x1a\nmesh.proto\x1a\x11radioconfig.proto\"\xfb\x02\n\x0c\x41\x64minMessage\x12!\n\tset_radio\x18\x01 \x01(\x0b\x32\x0c.RadioConfigH\x00\x12\x1a\n\tset_owner\x18\x02 \x01(\x0b\x32\x05.UserH\x00\x12\x1f\n\x0bset_channel\x18\x03 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_radio_request\x18\x04 \x01(\x08H\x00\x12*\n\x12get_radio_response\x18\x05 \x01(\x0b\x32\x0c.RadioConfigH\x00\x12\x1d\n\x13get_channel_request\x18\x06 \x01(\rH\x00\x12(\n\x14get_channel_response\x18\x07 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1d\n\x13\x63onfirm_set_channel\x18 \x01(\x08H\x00\x12\x1b\n\x11\x63onfirm_set_radio\x18! \x01(\x08H\x00\x12\x18\n\x0e\x65xit_simulator\x18\" \x01(\x08H\x00\x12\x18\n\x0ereboot_seconds\x18# \x01(\x05H\x00\x42\t\n\x07variantBG\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' , - dependencies=[mesh__pb2.DESCRIPTOR,radioconfig__pb2.DESCRIPTOR,channel__pb2.DESCRIPTOR,]) + dependencies=[channel__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,radioconfig__pb2.DESCRIPTOR,]) diff --git a/meshtastic/deviceonly_pb2.py b/meshtastic/deviceonly_pb2.py index ee22006..018b187 100644 --- a/meshtastic/deviceonly_pb2.py +++ b/meshtastic/deviceonly_pb2.py @@ -11,8 +11,8 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -from . import mesh_pb2 as mesh__pb2 from . import channel_pb2 as channel__pb2 +from . import mesh_pb2 as mesh__pb2 from . import radioconfig_pb2 as radioconfig__pb2 @@ -21,9 +21,9 @@ DESCRIPTOR = _descriptor.FileDescriptor( package='', syntax='proto3', serialized_options=b'\n\023com.geeksville.meshB\nDeviceOnlyH\003Z!github.com/meshtastic/gomeshproto', - serialized_pb=b'\n\x10\x64\x65viceonly.proto\x1a\nmesh.proto\x1a\rchannel.proto\x1a\x11radioconfig.proto\"\x80\x01\n\x11LegacyRadioConfig\x12\x39\n\x0bpreferences\x18\x01 \x01(\x0b\x32$.LegacyRadioConfig.LegacyPreferences\x1a\x30\n\x11LegacyPreferences\x12\x1b\n\x06region\x18\x0f \x01(\x0e\x32\x0b.RegionCode\"\x8f\x02\n\x0b\x44\x65viceState\x12\'\n\x0blegacyRadio\x18\x01 \x01(\x0b\x32\x12.LegacyRadioConfig\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(\x08J\x04\x08\x0c\x10\r\")\n\x0b\x43hannelFile\x12\x1a\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x08.ChannelBF\n\x13\x63om.geeksville.meshB\nDeviceOnlyH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' + serialized_pb=b'\n\x10\x64\x65viceonly.proto\x1a\rchannel.proto\x1a\nmesh.proto\x1a\x11radioconfig.proto\"\x80\x01\n\x11LegacyRadioConfig\x12\x39\n\x0bpreferences\x18\x01 \x01(\x0b\x32$.LegacyRadioConfig.LegacyPreferences\x1a\x30\n\x11LegacyPreferences\x12\x1b\n\x06region\x18\x0f \x01(\x0e\x32\x0b.RegionCode\"\x8f\x02\n\x0b\x44\x65viceState\x12\'\n\x0blegacyRadio\x18\x01 \x01(\x0b\x32\x12.LegacyRadioConfig\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(\x08J\x04\x08\x0c\x10\r\")\n\x0b\x43hannelFile\x12\x1a\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x08.ChannelBF\n\x13\x63om.geeksville.meshB\nDeviceOnlyH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' , - dependencies=[mesh__pb2.DESCRIPTOR,channel__pb2.DESCRIPTOR,radioconfig__pb2.DESCRIPTOR,]) + dependencies=[channel__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,radioconfig__pb2.DESCRIPTOR,]) diff --git a/meshtastic/storeforward_pb2.py b/meshtastic/storeforward_pb2.py index b27cb8e..51bb380 100644 --- a/meshtastic/storeforward_pb2.py +++ b/meshtastic/storeforward_pb2.py @@ -18,14 +18,14 @@ DESCRIPTOR = _descriptor.FileDescriptor( package='', syntax='proto3', serialized_options=b'\n\023com.geeksville.meshB\017StoreAndForwardH\003Z!github.com/meshtastic/gomeshproto', - serialized_pb=b'\n\x12storeforward.proto\"\x8d\x05\n\x16StoreAndForwardMessage\x12\x33\n\x02rr\x18\x01 \x01(\x0e\x32\'.StoreAndForwardMessage.RequestResponse\x12\x31\n\x05stats\x18\x02 \x01(\x0b\x32\".StoreAndForwardMessage.Statistics\x12\x30\n\x07history\x18\x03 \x01(\x0b\x32\x1f.StoreAndForwardMessage.History\x1a\xc6\x01\n\nStatistics\x12\x15\n\rMessagesTotal\x18\x01 \x01(\r\x12\x15\n\rMessagesSaved\x18\x02 \x01(\r\x12\x13\n\x0bMessagesMax\x18\x03 \x01(\r\x12\x0e\n\x06UpTime\x18\x04 \x01(\r\x12\x10\n\x08Requests\x18\x05 \x01(\r\x12\x17\n\x0fRequestsHistory\x18\x06 \x01(\r\x12\x11\n\tHeartbeat\x18\x07 \x01(\x08\x12\x11\n\tReturnMax\x18\x08 \x01(\r\x12\x14\n\x0cReturnWindow\x18\t \x01(\r\x1a\x32\n\x07History\x12\x17\n\x0fHistoryMessages\x18\x01 \x01(\r\x12\x0e\n\x06Window\x18\x02 \x01(\r\"\xdb\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\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\x08\n\x03MAX\x10\xff\x01\x42K\n\x13\x63om.geeksville.meshB\x0fStoreAndForwardH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' + serialized_pb=b'\n\x12storeforward.proto\"\xe7\x04\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\x1a\xc6\x01\n\nStatistics\x12\x15\n\rMessagesTotal\x18\x01 \x01(\r\x12\x15\n\rMessagesSaved\x18\x02 \x01(\r\x12\x13\n\x0bMessagesMax\x18\x03 \x01(\r\x12\x0e\n\x06UpTime\x18\x04 \x01(\r\x12\x10\n\x08Requests\x18\x05 \x01(\r\x12\x17\n\x0fRequestsHistory\x18\x06 \x01(\r\x12\x11\n\tHeartbeat\x18\x07 \x01(\x08\x12\x11\n\tReturnMax\x18\x08 \x01(\r\x12\x14\n\x0cReturnWindow\x18\t \x01(\r\x1a\x32\n\x07History\x12\x17\n\x0fHistoryMessages\x18\x01 \x01(\r\x12\x0e\n\x06Window\x18\x02 \x01(\r\"\xd1\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\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\x10iBK\n\x13\x63om.geeksville.meshB\x0fStoreAndForwardH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' ) -_STOREANDFORWARDMESSAGE_REQUESTRESPONSE = _descriptor.EnumDescriptor( +_STOREANDFORWARD_REQUESTRESPONSE = _descriptor.EnumDescriptor( name='RequestResponse', - full_name='StoreAndForwardMessage.RequestResponse', + full_name='StoreAndForward.RequestResponse', filename=None, file=DESCRIPTOR, values=[ @@ -73,84 +73,80 @@ _STOREANDFORWARDMESSAGE_REQUESTRESPONSE = _descriptor.EnumDescriptor( name='CLIENT_PONG', index=10, number=105, serialized_options=None, type=None), - _descriptor.EnumValueDescriptor( - name='MAX', index=11, number=255, - serialized_options=None, - type=None), ], containing_type=None, serialized_options=None, - serialized_start=457, - serialized_end=676, + serialized_start=429, + serialized_end=638, ) -_sym_db.RegisterEnumDescriptor(_STOREANDFORWARDMESSAGE_REQUESTRESPONSE) +_sym_db.RegisterEnumDescriptor(_STOREANDFORWARD_REQUESTRESPONSE) -_STOREANDFORWARDMESSAGE_STATISTICS = _descriptor.Descriptor( +_STOREANDFORWARD_STATISTICS = _descriptor.Descriptor( name='Statistics', - full_name='StoreAndForwardMessage.Statistics', + full_name='StoreAndForward.Statistics', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='MessagesTotal', full_name='StoreAndForwardMessage.Statistics.MessagesTotal', index=0, + name='MessagesTotal', full_name='StoreAndForward.Statistics.MessagesTotal', index=0, number=1, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='MessagesSaved', full_name='StoreAndForwardMessage.Statistics.MessagesSaved', index=1, + name='MessagesSaved', full_name='StoreAndForward.Statistics.MessagesSaved', index=1, number=2, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='MessagesMax', full_name='StoreAndForwardMessage.Statistics.MessagesMax', index=2, + name='MessagesMax', full_name='StoreAndForward.Statistics.MessagesMax', index=2, number=3, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='UpTime', full_name='StoreAndForwardMessage.Statistics.UpTime', index=3, + name='UpTime', full_name='StoreAndForward.Statistics.UpTime', index=3, number=4, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='Requests', full_name='StoreAndForwardMessage.Statistics.Requests', index=4, + name='Requests', full_name='StoreAndForward.Statistics.Requests', index=4, number=5, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='RequestsHistory', full_name='StoreAndForwardMessage.Statistics.RequestsHistory', index=5, + name='RequestsHistory', full_name='StoreAndForward.Statistics.RequestsHistory', index=5, number=6, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='Heartbeat', full_name='StoreAndForwardMessage.Statistics.Heartbeat', index=6, + name='Heartbeat', full_name='StoreAndForward.Statistics.Heartbeat', index=6, number=7, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='ReturnMax', full_name='StoreAndForwardMessage.Statistics.ReturnMax', index=7, + name='ReturnMax', full_name='StoreAndForward.Statistics.ReturnMax', index=7, number=8, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='ReturnWindow', full_name='StoreAndForwardMessage.Statistics.ReturnWindow', index=8, + name='ReturnWindow', full_name='StoreAndForward.Statistics.ReturnWindow', index=8, number=9, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -168,26 +164,26 @@ _STOREANDFORWARDMESSAGE_STATISTICS = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=204, - serialized_end=402, + serialized_start=176, + serialized_end=374, ) -_STOREANDFORWARDMESSAGE_HISTORY = _descriptor.Descriptor( +_STOREANDFORWARD_HISTORY = _descriptor.Descriptor( name='History', - full_name='StoreAndForwardMessage.History', + full_name='StoreAndForward.History', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='HistoryMessages', full_name='StoreAndForwardMessage.History.HistoryMessages', index=0, + name='HistoryMessages', full_name='StoreAndForward.History.HistoryMessages', index=0, number=1, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='Window', full_name='StoreAndForwardMessage.History.Window', index=1, + name='Window', full_name='StoreAndForward.History.Window', index=1, number=2, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -205,33 +201,33 @@ _STOREANDFORWARDMESSAGE_HISTORY = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=404, - serialized_end=454, + serialized_start=376, + serialized_end=426, ) -_STOREANDFORWARDMESSAGE = _descriptor.Descriptor( - name='StoreAndForwardMessage', - full_name='StoreAndForwardMessage', +_STOREANDFORWARD = _descriptor.Descriptor( + name='StoreAndForward', + full_name='StoreAndForward', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='rr', full_name='StoreAndForwardMessage.rr', index=0, + name='rr', full_name='StoreAndForward.rr', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='stats', full_name='StoreAndForwardMessage.stats', index=1, + name='stats', full_name='StoreAndForward.stats', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='history', full_name='StoreAndForwardMessage.history', index=2, + name='history', full_name='StoreAndForward.history', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -240,9 +236,9 @@ _STOREANDFORWARDMESSAGE = _descriptor.Descriptor( ], extensions=[ ], - nested_types=[_STOREANDFORWARDMESSAGE_STATISTICS, _STOREANDFORWARDMESSAGE_HISTORY, ], + nested_types=[_STOREANDFORWARD_STATISTICS, _STOREANDFORWARD_HISTORY, ], enum_types=[ - _STOREANDFORWARDMESSAGE_REQUESTRESPONSE, + _STOREANDFORWARD_REQUESTRESPONSE, ], serialized_options=None, is_extendable=False, @@ -251,40 +247,40 @@ _STOREANDFORWARDMESSAGE = _descriptor.Descriptor( oneofs=[ ], serialized_start=23, - serialized_end=676, + serialized_end=638, ) -_STOREANDFORWARDMESSAGE_STATISTICS.containing_type = _STOREANDFORWARDMESSAGE -_STOREANDFORWARDMESSAGE_HISTORY.containing_type = _STOREANDFORWARDMESSAGE -_STOREANDFORWARDMESSAGE.fields_by_name['rr'].enum_type = _STOREANDFORWARDMESSAGE_REQUESTRESPONSE -_STOREANDFORWARDMESSAGE.fields_by_name['stats'].message_type = _STOREANDFORWARDMESSAGE_STATISTICS -_STOREANDFORWARDMESSAGE.fields_by_name['history'].message_type = _STOREANDFORWARDMESSAGE_HISTORY -_STOREANDFORWARDMESSAGE_REQUESTRESPONSE.containing_type = _STOREANDFORWARDMESSAGE -DESCRIPTOR.message_types_by_name['StoreAndForwardMessage'] = _STOREANDFORWARDMESSAGE +_STOREANDFORWARD_STATISTICS.containing_type = _STOREANDFORWARD +_STOREANDFORWARD_HISTORY.containing_type = _STOREANDFORWARD +_STOREANDFORWARD.fields_by_name['rr'].enum_type = _STOREANDFORWARD_REQUESTRESPONSE +_STOREANDFORWARD.fields_by_name['stats'].message_type = _STOREANDFORWARD_STATISTICS +_STOREANDFORWARD.fields_by_name['history'].message_type = _STOREANDFORWARD_HISTORY +_STOREANDFORWARD_REQUESTRESPONSE.containing_type = _STOREANDFORWARD +DESCRIPTOR.message_types_by_name['StoreAndForward'] = _STOREANDFORWARD _sym_db.RegisterFileDescriptor(DESCRIPTOR) -StoreAndForwardMessage = _reflection.GeneratedProtocolMessageType('StoreAndForwardMessage', (_message.Message,), { +StoreAndForward = _reflection.GeneratedProtocolMessageType('StoreAndForward', (_message.Message,), { 'Statistics' : _reflection.GeneratedProtocolMessageType('Statistics', (_message.Message,), { - 'DESCRIPTOR' : _STOREANDFORWARDMESSAGE_STATISTICS, + 'DESCRIPTOR' : _STOREANDFORWARD_STATISTICS, '__module__' : 'storeforward_pb2' - # @@protoc_insertion_point(class_scope:StoreAndForwardMessage.Statistics) + # @@protoc_insertion_point(class_scope:StoreAndForward.Statistics) }) , 'History' : _reflection.GeneratedProtocolMessageType('History', (_message.Message,), { - 'DESCRIPTOR' : _STOREANDFORWARDMESSAGE_HISTORY, + 'DESCRIPTOR' : _STOREANDFORWARD_HISTORY, '__module__' : 'storeforward_pb2' - # @@protoc_insertion_point(class_scope:StoreAndForwardMessage.History) + # @@protoc_insertion_point(class_scope:StoreAndForward.History) }) , - 'DESCRIPTOR' : _STOREANDFORWARDMESSAGE, + 'DESCRIPTOR' : _STOREANDFORWARD, '__module__' : 'storeforward_pb2' - # @@protoc_insertion_point(class_scope:StoreAndForwardMessage) + # @@protoc_insertion_point(class_scope:StoreAndForward) }) -_sym_db.RegisterMessage(StoreAndForwardMessage) -_sym_db.RegisterMessage(StoreAndForwardMessage.Statistics) -_sym_db.RegisterMessage(StoreAndForwardMessage.History) +_sym_db.RegisterMessage(StoreAndForward) +_sym_db.RegisterMessage(StoreAndForward.Statistics) +_sym_db.RegisterMessage(StoreAndForward.History) DESCRIPTOR._options = None diff --git a/setup.py b/setup.py index 531906f..2996dc9 100644 --- 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.2.43", + version="1.2.44", description="Python API & client shell for talking to Meshtastic devices", long_description=long_description, long_description_content_type="text/markdown",