diff --git a/bin/regen-protobufs.sh b/bin/regen-protobufs.sh index 9357d60..1dfe6ad 100755 --- a/bin/regen-protobufs.sh +++ b/bin/regen-protobufs.sh @@ -7,18 +7,18 @@ ./nanopb-0.4.7/generator-bin/protoc -I=protobufs --python_out ./ ./protobufs/meshtastic/*.proto # workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628 -mv ./meshtastic/*_pb2.py ./meshtastic/pbDefinitions +mv ./meshtastic/*_pb2.py ./meshtastic/PbDefinitions if [[ $OSTYPE == 'darwin'* ]]; then - sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/pbDefinitions/*.py + sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/PbDefinitions/*.py # automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27) - sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/pbDefinitions/mesh_pb2.py - # change from meshtastic to meshtastic.pbDefinitions - sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.pbDefinitions\1/' meshtastic/pbDefinitions/*.py + sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/PbDefinitions/mesh_pb2.py + # change from meshtastic to meshtastic.PbDefinitions + sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.PbDefinitions\1/' meshtastic/PbDefinitions/*.py else - sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/pbDefinitions/*.py + sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/PbDefinitions/*.py # automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27) - sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/pbDefinitions/mesh_pb2.py - # change from meshtastic to meshtastic.pbDefinitions - sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.pbDefinitions\1/' meshtastic/pbDefinitions/*.py + sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/PbDefinitions/mesh_pb2.py + # change from meshtastic to meshtastic.PbDefinitions + sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.PbDefinitions\1/' meshtastic/PbDefinitions/*.py fi \ No newline at end of file diff --git a/meshtastic/pbDefinitions/__init__.py b/meshtastic/PbDefinitions/__init__.py similarity index 100% rename from meshtastic/pbDefinitions/__init__.py rename to meshtastic/PbDefinitions/__init__.py diff --git a/meshtastic/pbDefinitions/admin_pb2.py b/meshtastic/PbDefinitions/admin_pb2.py similarity index 93% rename from meshtastic/pbDefinitions/admin_pb2.py rename to meshtastic/PbDefinitions/admin_pb2.py index d88c4c4..366a345 100644 --- a/meshtastic/pbDefinitions/admin_pb2.py +++ b/meshtastic/PbDefinitions/admin_pb2.py @@ -11,12 +11,12 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -from meshtastic.pbDefinitions import channel_pb2 as meshtastic_dot_channel__pb2 -from meshtastic.pbDefinitions import config_pb2 as meshtastic_dot_config__pb2 -from meshtastic.pbDefinitions import connection_status_pb2 as meshtastic_dot_connection__status__pb2 -from meshtastic.pbDefinitions import deviceonly_pb2 as meshtastic_dot_deviceonly__pb2 -from meshtastic.pbDefinitions import mesh_pb2 as meshtastic_dot_mesh__pb2 -from meshtastic.pbDefinitions import module_config_pb2 as meshtastic_dot_module__config__pb2 +from meshtastic.PbDefinitions import channel_pb2 as meshtastic_dot_channel__pb2 +from meshtastic.PbDefinitions import config_pb2 as meshtastic_dot_config__pb2 +from meshtastic.PbDefinitions import connection_status_pb2 as meshtastic_dot_connection__status__pb2 +from meshtastic.PbDefinitions import deviceonly_pb2 as meshtastic_dot_deviceonly__pb2 +from meshtastic.PbDefinitions import mesh_pb2 as meshtastic_dot_mesh__pb2 +from meshtastic.PbDefinitions import module_config_pb2 as meshtastic_dot_module__config__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16meshtastic/admin.proto\x12\nmeshtastic\x1a\x18meshtastic/channel.proto\x1a\x17meshtastic/config.proto\x1a\"meshtastic/connection_status.proto\x1a\x1bmeshtastic/deviceonly.proto\x1a\x15meshtastic/mesh.proto\x1a\x1emeshtastic/module_config.proto\"\xbc\x10\n\x0c\x41\x64minMessage\x12\x1d\n\x13get_channel_request\x18\x01 \x01(\rH\x00\x12\x33\n\x14get_channel_response\x18\x02 \x01(\x0b\x32\x13.meshtastic.ChannelH\x00\x12\x1b\n\x11get_owner_request\x18\x03 \x01(\x08H\x00\x12.\n\x12get_owner_response\x18\x04 \x01(\x0b\x32\x10.meshtastic.UserH\x00\x12\x41\n\x12get_config_request\x18\x05 \x01(\x0e\x32#.meshtastic.AdminMessage.ConfigTypeH\x00\x12\x31\n\x13get_config_response\x18\x06 \x01(\x0b\x32\x12.meshtastic.ConfigH\x00\x12N\n\x19get_module_config_request\x18\x07 \x01(\x0e\x32).meshtastic.AdminMessage.ModuleConfigTypeH\x00\x12>\n\x1aget_module_config_response\x18\x08 \x01(\x0b\x32\x18.meshtastic.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\x42\n\x1cget_device_metadata_response\x18\r \x01(\x0b\x32\x1a.meshtastic.DeviceMetadataH\x00\x12\x1e\n\x14get_ringtone_request\x18\x0e \x01(\x08H\x00\x12\x1f\n\x15get_ringtone_response\x18\x0f \x01(\tH\x00\x12.\n$get_device_connection_status_request\x18\x10 \x01(\x08H\x00\x12S\n%get_device_connection_status_response\x18\x11 \x01(\x0b\x32\".meshtastic.DeviceConnectionStatusH\x00\x12\x31\n\x0cset_ham_mode\x18\x12 \x01(\x0b\x32\x19.meshtastic.HamParametersH\x00\x12/\n%get_node_remote_hardware_pins_request\x18\x13 \x01(\x08H\x00\x12\\\n&get_node_remote_hardware_pins_response\x18\x14 \x01(\x0b\x32*.meshtastic.NodeRemoteHardwarePinsResponseH\x00\x12 \n\x16\x65nter_dfu_mode_request\x18\x15 \x01(\x08H\x00\x12\x1d\n\x13\x64\x65lete_file_request\x18\x16 \x01(\tH\x00\x12%\n\tset_owner\x18 \x01(\x0b\x32\x10.meshtastic.UserH\x00\x12*\n\x0bset_channel\x18! \x01(\x0b\x32\x13.meshtastic.ChannelH\x00\x12(\n\nset_config\x18\" \x01(\x0b\x32\x12.meshtastic.ConfigH\x00\x12\x35\n\x11set_module_config\x18# \x01(\x0b\x32\x18.meshtastic.ModuleConfigH\x00\x12,\n\"set_canned_message_module_messages\x18$ \x01(\tH\x00\x12\x1e\n\x14set_ringtone_message\x18% \x01(\tH\x00\x12\x1b\n\x11remove_by_nodenum\x18& \x01(\rH\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\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\"\xbb\x02\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\x12\x19\n\x15REMOTEHARDWARE_CONFIG\x10\x08\x12\x17\n\x13NEIGHBORINFO_CONFIG\x10\t\x12\x1a\n\x16\x41MBIENTLIGHTING_CONFIG\x10\n\x12\x1a\n\x16\x44\x45TECTIONSENSOR_CONFIG\x10\x0b\x12\x15\n\x11PAXCOUNTER_CONFIG\x10\x0c\x42\x11\n\x0fpayload_variant\"[\n\rHamParameters\x12\x11\n\tcall_sign\x18\x01 \x01(\t\x12\x10\n\x08tx_power\x18\x02 \x01(\x05\x12\x11\n\tfrequency\x18\x03 \x01(\x02\x12\x12\n\nshort_name\x18\x04 \x01(\t\"f\n\x1eNodeRemoteHardwarePinsResponse\x12\x44\n\x19node_remote_hardware_pins\x18\x01 \x03(\x0b\x32!.meshtastic.NodeRemoteHardwarePinB`\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3') diff --git a/meshtastic/pbDefinitions/apponly_pb2.py b/meshtastic/PbDefinitions/apponly_pb2.py similarity index 92% rename from meshtastic/pbDefinitions/apponly_pb2.py rename to meshtastic/PbDefinitions/apponly_pb2.py index 4fe20cf..92f4b71 100644 --- a/meshtastic/pbDefinitions/apponly_pb2.py +++ b/meshtastic/PbDefinitions/apponly_pb2.py @@ -11,8 +11,8 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -from meshtastic.pbDefinitions import channel_pb2 as meshtastic_dot_channel__pb2 -from meshtastic.pbDefinitions import config_pb2 as meshtastic_dot_config__pb2 +from meshtastic.PbDefinitions import channel_pb2 as meshtastic_dot_channel__pb2 +from meshtastic.PbDefinitions import config_pb2 as meshtastic_dot_config__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18meshtastic/apponly.proto\x12\nmeshtastic\x1a\x18meshtastic/channel.proto\x1a\x17meshtastic/config.proto\"o\n\nChannelSet\x12-\n\x08settings\x18\x01 \x03(\x0b\x32\x1b.meshtastic.ChannelSettings\x12\x32\n\x0blora_config\x18\x02 \x01(\x0b\x32\x1d.meshtastic.Config.LoRaConfigBb\n\x13\x63om.geeksville.meshB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3') diff --git a/meshtastic/pbDefinitions/atak_pb2.py b/meshtastic/PbDefinitions/atak_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/atak_pb2.py rename to meshtastic/PbDefinitions/atak_pb2.py diff --git a/meshtastic/pbDefinitions/cannedmessages_pb2.py b/meshtastic/PbDefinitions/cannedmessages_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/cannedmessages_pb2.py rename to meshtastic/PbDefinitions/cannedmessages_pb2.py diff --git a/meshtastic/pbDefinitions/channel_pb2.py b/meshtastic/PbDefinitions/channel_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/channel_pb2.py rename to meshtastic/PbDefinitions/channel_pb2.py diff --git a/meshtastic/pbDefinitions/clientonly_pb2.py b/meshtastic/PbDefinitions/clientonly_pb2.py similarity index 96% rename from meshtastic/pbDefinitions/clientonly_pb2.py rename to meshtastic/PbDefinitions/clientonly_pb2.py index 6dd60b1..08b10e4 100644 --- a/meshtastic/pbDefinitions/clientonly_pb2.py +++ b/meshtastic/PbDefinitions/clientonly_pb2.py @@ -11,7 +11,7 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -from meshtastic.pbDefinitions import localonly_pb2 as meshtastic_dot_localonly__pb2 +from meshtastic.PbDefinitions import localonly_pb2 as meshtastic_dot_localonly__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bmeshtastic/clientonly.proto\x12\nmeshtastic\x1a\x1ameshtastic/localonly.proto\"\x8d\x02\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\x17.meshtastic.LocalConfigH\x03\x88\x01\x01\x12\x39\n\rmodule_config\x18\x05 \x01(\x0b\x32\x1d.meshtastic.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') diff --git a/meshtastic/pbDefinitions/config_pb2.py b/meshtastic/PbDefinitions/config_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/config_pb2.py rename to meshtastic/PbDefinitions/config_pb2.py diff --git a/meshtastic/pbDefinitions/connection_status_pb2.py b/meshtastic/PbDefinitions/connection_status_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/connection_status_pb2.py rename to meshtastic/PbDefinitions/connection_status_pb2.py diff --git a/meshtastic/pbDefinitions/device_metadata_pb2.py b/meshtastic/PbDefinitions/device_metadata_pb2.py similarity index 94% rename from meshtastic/pbDefinitions/device_metadata_pb2.py rename to meshtastic/PbDefinitions/device_metadata_pb2.py index 5d77eb0..545165d 100644 --- a/meshtastic/pbDefinitions/device_metadata_pb2.py +++ b/meshtastic/PbDefinitions/device_metadata_pb2.py @@ -12,8 +12,8 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -from meshtastic.pbDefinitions.pbDefinitions import config_pb2 as meshtastic_dot_config__pb2 -from meshtastic.pbDefinitions.pbDefinitions import mesh_pb2 as meshtastic_dot_mesh__pb2 +from meshtastic.PbDefinitions.PbDefinitions import config_pb2 as meshtastic_dot_config__pb2 +from meshtastic.PbDefinitions.PbDefinitions import mesh_pb2 as meshtastic_dot_mesh__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n meshtastic/device_metadata.proto\x1a\x17meshtastic/config.proto\x1a\x15meshtastic/mesh.proto\"\xfc\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\x12\'\n\x04role\x18\x07 \x01(\x0e\x32\x19.Config.DeviceConfig.Role\x12\x16\n\x0eposition_flags\x18\x08 \x01(\r\x12 \n\x08hw_model\x18\t \x01(\x0e\x32\x0e.HardwareModelBi\n\x13\x63om.geeksville.meshB\x14\x44\x65viceMetadataProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3') diff --git a/meshtastic/pbDefinitions/deviceonly_pb2.py b/meshtastic/PbDefinitions/deviceonly_pb2.py similarity index 92% rename from meshtastic/pbDefinitions/deviceonly_pb2.py rename to meshtastic/PbDefinitions/deviceonly_pb2.py index 1ccaa09..9e1f948 100644 --- a/meshtastic/pbDefinitions/deviceonly_pb2.py +++ b/meshtastic/PbDefinitions/deviceonly_pb2.py @@ -11,11 +11,11 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -from meshtastic.pbDefinitions import channel_pb2 as meshtastic_dot_channel__pb2 -from meshtastic.pbDefinitions import localonly_pb2 as meshtastic_dot_localonly__pb2 -from meshtastic.pbDefinitions import mesh_pb2 as meshtastic_dot_mesh__pb2 -from meshtastic.pbDefinitions import telemetry_pb2 as meshtastic_dot_telemetry__pb2 -from meshtastic.pbDefinitions import module_config_pb2 as meshtastic_dot_module__config__pb2 +from meshtastic.PbDefinitions import channel_pb2 as meshtastic_dot_channel__pb2 +from meshtastic.PbDefinitions import localonly_pb2 as meshtastic_dot_localonly__pb2 +from meshtastic.PbDefinitions import mesh_pb2 as meshtastic_dot_mesh__pb2 +from meshtastic.PbDefinitions import telemetry_pb2 as meshtastic_dot_telemetry__pb2 +from meshtastic.PbDefinitions import module_config_pb2 as meshtastic_dot_module__config__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bmeshtastic/deviceonly.proto\x12\nmeshtastic\x1a\x18meshtastic/channel.proto\x1a\x1ameshtastic/localonly.proto\x1a\x15meshtastic/mesh.proto\x1a\x1ameshtastic/telemetry.proto\x1a\x1emeshtastic/module_config.proto\"\x93\x03\n\x0b\x44\x65viceState\x12\'\n\x07my_node\x18\x02 \x01(\x0b\x32\x16.meshtastic.MyNodeInfo\x12\x1f\n\x05owner\x18\x03 \x01(\x0b\x32\x10.meshtastic.User\x12-\n\rreceive_queue\x18\x05 \x03(\x0b\x32\x16.meshtastic.MeshPacket\x12\x0f\n\x07version\x18\x08 \x01(\r\x12/\n\x0frx_text_message\x18\x07 \x01(\x0b\x32\x16.meshtastic.MeshPacket\x12\x0f\n\x07no_save\x18\t \x01(\x08\x12\x15\n\rdid_gps_reset\x18\x0b \x01(\x08\x12+\n\x0brx_waypoint\x18\x0c \x01(\x0b\x32\x16.meshtastic.MeshPacket\x12\x44\n\x19node_remote_hardware_pins\x18\r \x03(\x0b\x32!.meshtastic.NodeRemoteHardwarePin\x12.\n\x0cnode_db_lite\x18\x0e \x03(\x0b\x32\x18.meshtastic.NodeInfoLite\"\xcc\x01\n\x0cNodeInfoLite\x12\x0b\n\x03num\x18\x01 \x01(\r\x12\x1e\n\x04user\x18\x02 \x01(\x0b\x32\x10.meshtastic.User\x12*\n\x08position\x18\x03 \x01(\x0b\x32\x18.meshtastic.PositionLite\x12\x0b\n\x03snr\x18\x04 \x01(\x02\x12\x12\n\nlast_heard\x18\x05 \x01(\x07\x12\x31\n\x0e\x64\x65vice_metrics\x18\x06 \x01(\x0b\x32\x19.meshtastic.DeviceMetrics\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\r\"\x90\x01\n\x0cPositionLite\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\x0c\n\x04time\x18\x04 \x01(\x07\x12\x37\n\x0flocation_source\x18\x05 \x01(\x0e\x32\x1e.meshtastic.Position.LocSource\"E\n\x0b\x43hannelFile\x12%\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x13.meshtastic.Channel\x12\x0f\n\x07version\x18\x02 \x01(\r\"\x97\x02\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)\n\x08oem_font\x18\x04 \x01(\x0e\x32\x17.meshtastic.ScreenFonts\x12\x10\n\x08oem_text\x18\x05 \x01(\t\x12\x13\n\x0boem_aes_key\x18\x06 \x01(\x0c\x12\x31\n\x10oem_local_config\x18\x07 \x01(\x0b\x32\x17.meshtastic.LocalConfig\x12>\n\x17oem_local_module_config\x18\x08 \x01(\x0b\x32\x1d.meshtastic.LocalModuleConfig\"U\n\x15NodeRemoteHardwarePin\x12\x10\n\x08node_num\x18\x01 \x01(\r\x12*\n\x03pin\x18\x02 \x01(\x0b\x32\x1d.meshtastic.RemoteHardwarePin*>\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\nDeviceOnlyZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3') diff --git a/meshtastic/pbDefinitions/localonly_pb2.py b/meshtastic/PbDefinitions/localonly_pb2.py similarity index 96% rename from meshtastic/pbDefinitions/localonly_pb2.py rename to meshtastic/PbDefinitions/localonly_pb2.py index 320e111..dd90733 100644 --- a/meshtastic/pbDefinitions/localonly_pb2.py +++ b/meshtastic/PbDefinitions/localonly_pb2.py @@ -11,8 +11,8 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -from meshtastic.pbDefinitions import config_pb2 as meshtastic_dot_config__pb2 -from meshtastic.pbDefinitions import module_config_pb2 as meshtastic_dot_module__config__pb2 +from meshtastic.PbDefinitions import config_pb2 as meshtastic_dot_config__pb2 +from meshtastic.PbDefinitions import module_config_pb2 as meshtastic_dot_module__config__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ameshtastic/localonly.proto\x12\nmeshtastic\x1a\x17meshtastic/config.proto\x1a\x1emeshtastic/module_config.proto\"\xfd\x02\n\x0bLocalConfig\x12/\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x1f.meshtastic.Config.DeviceConfig\x12\x33\n\x08position\x18\x02 \x01(\x0b\x32!.meshtastic.Config.PositionConfig\x12-\n\x05power\x18\x03 \x01(\x0b\x32\x1e.meshtastic.Config.PowerConfig\x12\x31\n\x07network\x18\x04 \x01(\x0b\x32 .meshtastic.Config.NetworkConfig\x12\x31\n\x07\x64isplay\x18\x05 \x01(\x0b\x32 .meshtastic.Config.DisplayConfig\x12+\n\x04lora\x18\x06 \x01(\x0b\x32\x1d.meshtastic.Config.LoRaConfig\x12\x35\n\tbluetooth\x18\x07 \x01(\x0b\x32\".meshtastic.Config.BluetoothConfig\x12\x0f\n\x07version\x18\x08 \x01(\r\"\xfb\x06\n\x11LocalModuleConfig\x12\x31\n\x04mqtt\x18\x01 \x01(\x0b\x32#.meshtastic.ModuleConfig.MQTTConfig\x12\x35\n\x06serial\x18\x02 \x01(\x0b\x32%.meshtastic.ModuleConfig.SerialConfig\x12R\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32\x33.meshtastic.ModuleConfig.ExternalNotificationConfig\x12\x42\n\rstore_forward\x18\x04 \x01(\x0b\x32+.meshtastic.ModuleConfig.StoreForwardConfig\x12<\n\nrange_test\x18\x05 \x01(\x0b\x32(.meshtastic.ModuleConfig.RangeTestConfig\x12;\n\ttelemetry\x18\x06 \x01(\x0b\x32(.meshtastic.ModuleConfig.TelemetryConfig\x12\x44\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32,.meshtastic.ModuleConfig.CannedMessageConfig\x12\x33\n\x05\x61udio\x18\t \x01(\x0b\x32$.meshtastic.ModuleConfig.AudioConfig\x12\x46\n\x0fremote_hardware\x18\n \x01(\x0b\x32-.meshtastic.ModuleConfig.RemoteHardwareConfig\x12\x42\n\rneighbor_info\x18\x0b \x01(\x0b\x32+.meshtastic.ModuleConfig.NeighborInfoConfig\x12H\n\x10\x61mbient_lighting\x18\x0c \x01(\x0b\x32..meshtastic.ModuleConfig.AmbientLightingConfig\x12H\n\x10\x64\x65tection_sensor\x18\r \x01(\x0b\x32..meshtastic.ModuleConfig.DetectionSensorConfig\x12=\n\npaxcounter\x18\x0e \x01(\x0b\x32).meshtastic.ModuleConfig.PaxcounterConfig\x12\x0f\n\x07version\x18\x08 \x01(\rBd\n\x13\x63om.geeksville.meshB\x0fLocalOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3') diff --git a/meshtastic/pbDefinitions/mesh_pb2.py b/meshtastic/PbDefinitions/mesh_pb2.py similarity index 97% rename from meshtastic/pbDefinitions/mesh_pb2.py rename to meshtastic/PbDefinitions/mesh_pb2.py index 599e62c..02aa803 100644 --- a/meshtastic/pbDefinitions/mesh_pb2.py +++ b/meshtastic/PbDefinitions/mesh_pb2.py @@ -11,12 +11,12 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -from meshtastic.pbDefinitions import channel_pb2 as meshtastic_dot_channel__pb2 -from meshtastic.pbDefinitions import config_pb2 as meshtastic_dot_config__pb2 -from meshtastic.pbDefinitions import module_config_pb2 as meshtastic_dot_module__config__pb2 -from meshtastic.pbDefinitions import portnums_pb2 as meshtastic_dot_portnums__pb2 -from meshtastic.pbDefinitions import telemetry_pb2 as meshtastic_dot_telemetry__pb2 -from meshtastic.pbDefinitions import xmodem_pb2 as meshtastic_dot_xmodem__pb2 +from meshtastic.PbDefinitions import channel_pb2 as meshtastic_dot_channel__pb2 +from meshtastic.PbDefinitions import config_pb2 as meshtastic_dot_config__pb2 +from meshtastic.PbDefinitions import module_config_pb2 as meshtastic_dot_module__config__pb2 +from meshtastic.PbDefinitions import portnums_pb2 as meshtastic_dot_portnums__pb2 +from meshtastic.PbDefinitions import telemetry_pb2 as meshtastic_dot_telemetry__pb2 +from meshtastic.PbDefinitions import xmodem_pb2 as meshtastic_dot_xmodem__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15meshtastic/mesh.proto\x12\nmeshtastic\x1a\x18meshtastic/channel.proto\x1a\x17meshtastic/config.proto\x1a\x1emeshtastic/module_config.proto\x1a\x19meshtastic/portnums.proto\x1a\x1ameshtastic/telemetry.proto\x1a\x17meshtastic/xmodem.proto\"\xe5\x05\n\x08Position\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\x0c\n\x04time\x18\x04 \x01(\x07\x12\x37\n\x0flocation_source\x18\x05 \x01(\x0e\x32\x1e.meshtastic.Position.LocSource\x12\x37\n\x0f\x61ltitude_source\x18\x06 \x01(\x0e\x32\x1e.meshtastic.Position.AltSource\x12\x11\n\ttimestamp\x18\x07 \x01(\x07\x12\x1f\n\x17timestamp_millis_adjust\x18\x08 \x01(\x05\x12\x14\n\x0c\x61ltitude_hae\x18\t \x01(\x11\x12#\n\x1b\x61ltitude_geoidal_separation\x18\n \x01(\x11\x12\x0c\n\x04PDOP\x18\x0b \x01(\r\x12\x0c\n\x04HDOP\x18\x0c \x01(\r\x12\x0c\n\x04VDOP\x18\r \x01(\r\x12\x14\n\x0cgps_accuracy\x18\x0e \x01(\r\x12\x14\n\x0cground_speed\x18\x0f \x01(\r\x12\x14\n\x0cground_track\x18\x10 \x01(\r\x12\x13\n\x0b\x66ix_quality\x18\x11 \x01(\r\x12\x10\n\x08\x66ix_type\x18\x12 \x01(\r\x12\x14\n\x0csats_in_view\x18\x13 \x01(\r\x12\x11\n\tsensor_id\x18\x14 \x01(\r\x12\x13\n\x0bnext_update\x18\x15 \x01(\r\x12\x12\n\nseq_number\x18\x16 \x01(\r\x12\x16\n\x0eprecision_bits\x18\x17 \x01(\r\"N\n\tLocSource\x12\r\n\tLOC_UNSET\x10\x00\x12\x0e\n\nLOC_MANUAL\x10\x01\x12\x10\n\x0cLOC_INTERNAL\x10\x02\x12\x10\n\x0cLOC_EXTERNAL\x10\x03\"b\n\tAltSource\x12\r\n\tALT_UNSET\x10\x00\x12\x0e\n\nALT_MANUAL\x10\x01\x12\x10\n\x0c\x41LT_INTERNAL\x10\x02\x12\x10\n\x0c\x41LT_EXTERNAL\x10\x03\x12\x12\n\x0e\x41LT_BAROMETRIC\x10\x04\"\xc4\x01\n\x04User\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tlong_name\x18\x02 \x01(\t\x12\x12\n\nshort_name\x18\x03 \x01(\t\x12\x13\n\x07macaddr\x18\x04 \x01(\x0c\x42\x02\x18\x01\x12+\n\x08hw_model\x18\x05 \x01(\x0e\x32\x19.meshtastic.HardwareModel\x12\x13\n\x0bis_licensed\x18\x06 \x01(\x08\x12\x32\n\x04role\x18\x07 \x01(\x0e\x32$.meshtastic.Config.DeviceConfig.Role\"\x1f\n\x0eRouteDiscovery\x12\r\n\x05route\x18\x01 \x03(\x07\"\xfc\x02\n\x07Routing\x12\x33\n\rroute_request\x18\x01 \x01(\x0b\x32\x1a.meshtastic.RouteDiscoveryH\x00\x12\x31\n\x0broute_reply\x18\x02 \x01(\x0b\x32\x1a.meshtastic.RouteDiscoveryH\x00\x12\x31\n\x0c\x65rror_reason\x18\x03 \x01(\x0e\x32\x19.meshtastic.Routing.ErrorH\x00\"\xca\x01\n\x05\x45rror\x12\x08\n\x04NONE\x10\x00\x12\x0c\n\x08NO_ROUTE\x10\x01\x12\x0b\n\x07GOT_NAK\x10\x02\x12\x0b\n\x07TIMEOUT\x10\x03\x12\x10\n\x0cNO_INTERFACE\x10\x04\x12\x12\n\x0eMAX_RETRANSMIT\x10\x05\x12\x0e\n\nNO_CHANNEL\x10\x06\x12\r\n\tTOO_LARGE\x10\x07\x12\x0f\n\x0bNO_RESPONSE\x10\x08\x12\x14\n\x10\x44UTY_CYCLE_LIMIT\x10\t\x12\x0f\n\x0b\x42\x41\x44_REQUEST\x10 \x12\x12\n\x0eNOT_AUTHORIZED\x10!B\t\n\x07variant\"\xa7\x01\n\x04\x44\x61ta\x12$\n\x07portnum\x18\x01 \x01(\x0e\x32\x13.meshtastic.PortNum\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\x12\x15\n\rwant_response\x18\x03 \x01(\x08\x12\x0c\n\x04\x64\x65st\x18\x04 \x01(\x07\x12\x0e\n\x06source\x18\x05 \x01(\x07\x12\x12\n\nrequest_id\x18\x06 \x01(\x07\x12\x10\n\x08reply_id\x18\x07 \x01(\x07\x12\r\n\x05\x65moji\x18\x08 \x01(\x07\"\x93\x01\n\x08Waypoint\x12\n\n\x02id\x18\x01 \x01(\r\x12\x12\n\nlatitude_i\x18\x02 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x03 \x01(\x0f\x12\x0e\n\x06\x65xpire\x18\x04 \x01(\r\x12\x11\n\tlocked_to\x18\x05 \x01(\r\x12\x0c\n\x04name\x18\x06 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x07 \x01(\t\x12\x0c\n\x04icon\x18\x08 \x01(\x07\"l\n\x16MqttClientProxyMessage\x12\r\n\x05topic\x18\x01 \x01(\t\x12\x0e\n\x04\x64\x61ta\x18\x02 \x01(\x0cH\x00\x12\x0e\n\x04text\x18\x03 \x01(\tH\x00\x12\x10\n\x08retained\x18\x04 \x01(\x08\x42\x11\n\x0fpayload_variant\"\x82\x04\n\nMeshPacket\x12\x0c\n\x04\x66rom\x18\x01 \x01(\x07\x12\n\n\x02to\x18\x02 \x01(\x07\x12\x0f\n\x07\x63hannel\x18\x03 \x01(\r\x12#\n\x07\x64\x65\x63oded\x18\x04 \x01(\x0b\x32\x10.meshtastic.DataH\x00\x12\x13\n\tencrypted\x18\x05 \x01(\x0cH\x00\x12\n\n\x02id\x18\x06 \x01(\x07\x12\x0f\n\x07rx_time\x18\x07 \x01(\x07\x12\x0e\n\x06rx_snr\x18\x08 \x01(\x02\x12\x11\n\thop_limit\x18\t \x01(\r\x12\x10\n\x08want_ack\x18\n \x01(\x08\x12\x31\n\x08priority\x18\x0b \x01(\x0e\x32\x1f.meshtastic.MeshPacket.Priority\x12\x0f\n\x07rx_rssi\x18\x0c \x01(\x05\x12\x33\n\x07\x64\x65layed\x18\r \x01(\x0e\x32\x1e.meshtastic.MeshPacket.DelayedB\x02\x18\x01\x12\x10\n\x08via_mqtt\x18\x0e \x01(\x08\"[\n\x08Priority\x12\t\n\x05UNSET\x10\x00\x12\x07\n\x03MIN\x10\x01\x12\x0e\n\nBACKGROUND\x10\n\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10@\x12\x0c\n\x08RELIABLE\x10\x46\x12\x07\n\x03\x41\x43K\x10x\x12\x07\n\x03MAX\x10\x7f\"B\n\x07\x44\x65layed\x12\x0c\n\x08NO_DELAY\x10\x00\x12\x15\n\x11\x44\x45LAYED_BROADCAST\x10\x01\x12\x12\n\x0e\x44\x45LAYED_DIRECT\x10\x02\x42\x11\n\x0fpayload_variant\"\xc4\x01\n\x08NodeInfo\x12\x0b\n\x03num\x18\x01 \x01(\r\x12\x1e\n\x04user\x18\x02 \x01(\x0b\x32\x10.meshtastic.User\x12&\n\x08position\x18\x03 \x01(\x0b\x32\x14.meshtastic.Position\x12\x0b\n\x03snr\x18\x04 \x01(\x02\x12\x12\n\nlast_heard\x18\x05 \x01(\x07\x12\x31\n\x0e\x64\x65vice_metrics\x18\x06 \x01(\x0b\x32\x19.meshtastic.DeviceMetrics\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\r\"P\n\nMyNodeInfo\x12\x13\n\x0bmy_node_num\x18\x01 \x01(\r\x12\x14\n\x0creboot_count\x18\x08 \x01(\r\x12\x17\n\x0fmin_app_version\x18\x0b \x01(\r\"\xc0\x01\n\tLogRecord\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\x0c\n\x04time\x18\x02 \x01(\x07\x12\x0e\n\x06source\x18\x03 \x01(\t\x12*\n\x05level\x18\x04 \x01(\x0e\x32\x1b.meshtastic.LogRecord.Level\"X\n\x05Level\x12\t\n\x05UNSET\x10\x00\x12\x0c\n\x08\x43RITICAL\x10\x32\x12\t\n\x05\x45RROR\x10(\x12\x0b\n\x07WARNING\x10\x1e\x12\x08\n\x04INFO\x10\x14\x12\t\n\x05\x44\x45\x42UG\x10\n\x12\t\n\x05TRACE\x10\x05\"P\n\x0bQueueStatus\x12\x0b\n\x03res\x18\x01 \x01(\x05\x12\x0c\n\x04\x66ree\x18\x02 \x01(\r\x12\x0e\n\x06maxlen\x18\x03 \x01(\r\x12\x16\n\x0emesh_packet_id\x18\x04 \x01(\r\"\xdb\x04\n\tFromRadio\x12\n\n\x02id\x18\x01 \x01(\r\x12(\n\x06packet\x18\x02 \x01(\x0b\x32\x16.meshtastic.MeshPacketH\x00\x12)\n\x07my_info\x18\x03 \x01(\x0b\x32\x16.meshtastic.MyNodeInfoH\x00\x12)\n\tnode_info\x18\x04 \x01(\x0b\x32\x14.meshtastic.NodeInfoH\x00\x12$\n\x06\x63onfig\x18\x05 \x01(\x0b\x32\x12.meshtastic.ConfigH\x00\x12+\n\nlog_record\x18\x06 \x01(\x0b\x32\x15.meshtastic.LogRecordH\x00\x12\x1c\n\x12\x63onfig_complete_id\x18\x07 \x01(\rH\x00\x12\x12\n\x08rebooted\x18\x08 \x01(\x08H\x00\x12\x30\n\x0cmoduleConfig\x18\t \x01(\x0b\x32\x18.meshtastic.ModuleConfigH\x00\x12&\n\x07\x63hannel\x18\n \x01(\x0b\x32\x13.meshtastic.ChannelH\x00\x12.\n\x0bqueueStatus\x18\x0b \x01(\x0b\x32\x17.meshtastic.QueueStatusH\x00\x12*\n\x0cxmodemPacket\x18\x0c \x01(\x0b\x32\x12.meshtastic.XModemH\x00\x12.\n\x08metadata\x18\r \x01(\x0b\x32\x1a.meshtastic.DeviceMetadataH\x00\x12\x44\n\x16mqttClientProxyMessage\x18\x0e \x01(\x0b\x32\".meshtastic.MqttClientProxyMessageH\x00\x42\x11\n\x0fpayload_variant\"\xe8\x01\n\x07ToRadio\x12(\n\x06packet\x18\x01 \x01(\x0b\x32\x16.meshtastic.MeshPacketH\x00\x12\x18\n\x0ewant_config_id\x18\x03 \x01(\rH\x00\x12\x14\n\ndisconnect\x18\x04 \x01(\x08H\x00\x12*\n\x0cxmodemPacket\x18\x05 \x01(\x0b\x32\x12.meshtastic.XModemH\x00\x12\x44\n\x16mqttClientProxyMessage\x18\x06 \x01(\x0b\x32\".meshtastic.MqttClientProxyMessageH\x00\x42\x11\n\x0fpayload_variant\"@\n\nCompressed\x12$\n\x07portnum\x18\x01 \x01(\x0e\x32\x13.meshtastic.PortNum\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\"\x87\x01\n\x0cNeighborInfo\x12\x0f\n\x07node_id\x18\x01 \x01(\r\x12\x17\n\x0flast_sent_by_id\x18\x02 \x01(\r\x12$\n\x1cnode_broadcast_interval_secs\x18\x03 \x01(\r\x12\'\n\tneighbors\x18\x04 \x03(\x0b\x32\x14.meshtastic.Neighbor\"d\n\x08Neighbor\x12\x0f\n\x07node_id\x18\x01 \x01(\r\x12\x0b\n\x03snr\x18\x02 \x01(\x02\x12\x14\n\x0clast_rx_time\x18\x03 \x01(\x07\x12$\n\x1cnode_broadcast_interval_secs\x18\x04 \x01(\r\"\xad\x02\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\x12\x32\n\x04role\x18\x07 \x01(\x0e\x32$.meshtastic.Config.DeviceConfig.Role\x12\x16\n\x0eposition_flags\x18\x08 \x01(\r\x12+\n\x08hw_model\x18\t \x01(\x0e\x32\x19.meshtastic.HardwareModel\x12\x19\n\x11hasRemoteHardware\x18\n \x01(\x08*\xd4\x07\n\rHardwareModel\x12\t\n\x05UNSET\x10\x00\x12\x0c\n\x08TLORA_V2\x10\x01\x12\x0c\n\x08TLORA_V1\x10\x02\x12\x12\n\x0eTLORA_V2_1_1P6\x10\x03\x12\t\n\x05TBEAM\x10\x04\x12\x0f\n\x0bHELTEC_V2_0\x10\x05\x12\x0e\n\nTBEAM_V0P7\x10\x06\x12\n\n\x06T_ECHO\x10\x07\x12\x10\n\x0cTLORA_V1_1P3\x10\x08\x12\x0b\n\x07RAK4631\x10\t\x12\x0f\n\x0bHELTEC_V2_1\x10\n\x12\r\n\tHELTEC_V1\x10\x0b\x12\x18\n\x14LILYGO_TBEAM_S3_CORE\x10\x0c\x12\x0c\n\x08RAK11200\x10\r\x12\x0b\n\x07NANO_G1\x10\x0e\x12\x12\n\x0eTLORA_V2_1_1P8\x10\x0f\x12\x0f\n\x0bTLORA_T3_S3\x10\x10\x12\x14\n\x10NANO_G1_EXPLORER\x10\x11\x12\x11\n\rNANO_G2_ULTRA\x10\x12\x12\r\n\tLORA_TYPE\x10\x13\x12\x0e\n\nSTATION_G1\x10\x19\x12\x0c\n\x08RAK11310\x10\x1a\x12\x14\n\x10SENSELORA_RP2040\x10\x1b\x12\x10\n\x0cSENSELORA_S3\x10\x1c\x12\r\n\tCANARYONE\x10\x1d\x12\x0f\n\x0bRP2040_LORA\x10\x1e\x12\x0e\n\nSTATION_G2\x10\x1f\x12\x11\n\rLORA_RELAY_V1\x10 \x12\x0e\n\nNRF52840DK\x10!\x12\x07\n\x03PPR\x10\"\x12\x0f\n\x0bGENIEBLOCKS\x10#\x12\x11\n\rNRF52_UNKNOWN\x10$\x12\r\n\tPORTDUINO\x10%\x12\x0f\n\x0b\x41NDROID_SIM\x10&\x12\n\n\x06\x44IY_V1\x10\'\x12\x15\n\x11NRF52840_PCA10059\x10(\x12\n\n\x06\x44R_DEV\x10)\x12\x0b\n\x07M5STACK\x10*\x12\r\n\tHELTEC_V3\x10+\x12\x11\n\rHELTEC_WSL_V3\x10,\x12\x13\n\x0f\x42\x45TAFPV_2400_TX\x10-\x12\x17\n\x13\x42\x45TAFPV_900_NANO_TX\x10.\x12\x0c\n\x08RPI_PICO\x10/\x12\x1b\n\x17HELTEC_WIRELESS_TRACKER\x10\x30\x12\x19\n\x15HELTEC_WIRELESS_PAPER\x10\x31\x12\n\n\x06T_DECK\x10\x32\x12\x0e\n\nT_WATCH_S3\x10\x33\x12\x11\n\rPICOMPUTER_S3\x10\x34\x12\x0f\n\x0bHELTEC_HT62\x10\x35\x12\x12\n\x0e\x45\x42YTE_ESP32_S3\x10\x36\x12\x11\n\rESP32_S3_PICO\x10\x37\x12\r\n\tCHATTER_2\x10\x38\x12\x1e\n\x1aHELTEC_WIRELESS_PAPER_V1_0\x10\x39\x12 \n\x1cHELTEC_WIRELESS_TRACKER_V1_0\x10:\x12\x0f\n\nPRIVATE_HW\x10\xff\x01*,\n\tConstants\x12\x08\n\x04ZERO\x10\x00\x12\x15\n\x10\x44\x41TA_PAYLOAD_LEN\x10\xed\x01*\xee\x01\n\x11\x43riticalErrorCode\x12\x08\n\x04NONE\x10\x00\x12\x0f\n\x0bTX_WATCHDOG\x10\x01\x12\x14\n\x10SLEEP_ENTER_WAIT\x10\x02\x12\x0c\n\x08NO_RADIO\x10\x03\x12\x0f\n\x0bUNSPECIFIED\x10\x04\x12\x15\n\x11UBLOX_UNIT_FAILED\x10\x05\x12\r\n\tNO_AXP192\x10\x06\x12\x19\n\x15INVALID_RADIO_SETTING\x10\x07\x12\x13\n\x0fTRANSMIT_FAILED\x10\x08\x12\x0c\n\x08\x42ROWNOUT\x10\t\x12\x12\n\x0eSX1262_FAILURE\x10\n\x12\x11\n\rRADIO_SPI_BUG\x10\x0b\x42_\n\x13\x63om.geeksville.meshB\nMeshProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3') diff --git a/meshtastic/pbDefinitions/module_config_pb2.py b/meshtastic/PbDefinitions/module_config_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/module_config_pb2.py rename to meshtastic/PbDefinitions/module_config_pb2.py diff --git a/meshtastic/pbDefinitions/mqtt_pb2.py b/meshtastic/PbDefinitions/mqtt_pb2.py similarity index 95% rename from meshtastic/pbDefinitions/mqtt_pb2.py rename to meshtastic/PbDefinitions/mqtt_pb2.py index 77f3d81..6dcf0c8 100644 --- a/meshtastic/pbDefinitions/mqtt_pb2.py +++ b/meshtastic/PbDefinitions/mqtt_pb2.py @@ -11,7 +11,7 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -from meshtastic.pbDefinitions import mesh_pb2 as meshtastic_dot_mesh__pb2 +from meshtastic.PbDefinitions import mesh_pb2 as meshtastic_dot_mesh__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15meshtastic/mqtt.proto\x12\nmeshtastic\x1a\x15meshtastic/mesh.proto\"a\n\x0fServiceEnvelope\x12&\n\x06packet\x18\x01 \x01(\x0b\x32\x16.meshtastic.MeshPacket\x12\x12\n\nchannel_id\x18\x02 \x01(\t\x12\x12\n\ngateway_id\x18\x03 \x01(\tB_\n\x13\x63om.geeksville.meshB\nMQTTProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3') diff --git a/meshtastic/pbDefinitions/paxcount_pb2.py b/meshtastic/PbDefinitions/paxcount_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/paxcount_pb2.py rename to meshtastic/PbDefinitions/paxcount_pb2.py diff --git a/meshtastic/pbDefinitions/portnums_pb2.py b/meshtastic/PbDefinitions/portnums_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/portnums_pb2.py rename to meshtastic/PbDefinitions/portnums_pb2.py diff --git a/meshtastic/pbDefinitions/remote_hardware_pb2.py b/meshtastic/PbDefinitions/remote_hardware_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/remote_hardware_pb2.py rename to meshtastic/PbDefinitions/remote_hardware_pb2.py diff --git a/meshtastic/pbDefinitions/rtttl_pb2.py b/meshtastic/PbDefinitions/rtttl_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/rtttl_pb2.py rename to meshtastic/PbDefinitions/rtttl_pb2.py diff --git a/meshtastic/pbDefinitions/storeforward_pb2.py b/meshtastic/PbDefinitions/storeforward_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/storeforward_pb2.py rename to meshtastic/PbDefinitions/storeforward_pb2.py diff --git a/meshtastic/pbDefinitions/telemetry_pb2.py b/meshtastic/PbDefinitions/telemetry_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/telemetry_pb2.py rename to meshtastic/PbDefinitions/telemetry_pb2.py diff --git a/meshtastic/pbDefinitions/xmodem_pb2.py b/meshtastic/PbDefinitions/xmodem_pb2.py similarity index 100% rename from meshtastic/pbDefinitions/xmodem_pb2.py rename to meshtastic/PbDefinitions/xmodem_pb2.py diff --git a/meshtastic/__init__.py b/meshtastic/__init__.py index 50b04af..af76cbd 100644 --- a/meshtastic/__init__.py +++ b/meshtastic/__init__.py @@ -78,7 +78,7 @@ from google.protobuf.json_format import MessageToJson from pubsub import pub from tabulate import tabulate -from meshtastic.pbDefinitions import ( +from meshtastic.PbDefinitions import ( admin_pb2, apponly_pb2, channel_pb2, @@ -88,7 +88,7 @@ from meshtastic.pbDefinitions import ( remote_hardware_pb2, ) from meshtastic.node import Node -from meshtastic.pbDefinitions import telemetry_pb2 +from meshtastic.PbDefinitions import telemetry_pb2 from meshtastic.util import DeferredExecution, Timeout, catchAndIgnore, fixme, stripnl # Note: To follow PEP224, comments should be after the module variable. diff --git a/meshtastic/__main__.py b/meshtastic/__main__.py index fb7321b..c9be120 100644 --- a/meshtastic/__main__.py +++ b/meshtastic/__main__.py @@ -17,7 +17,7 @@ from pubsub import pub import meshtastic.test import meshtastic.util -from meshtastic.pbDefinitions import channel_pb2, config_pb2, portnums_pb2 +from meshtastic.PbDefinitions import channel_pb2, config_pb2, portnums_pb2 from meshtastic import remote_hardware from meshtastic.__init__ import BROADCAST_ADDR from meshtastic.ble_interface import BLEInterface diff --git a/meshtastic/mesh_interface.py b/meshtastic/mesh_interface.py index b602c11..db5bdc9 100644 --- a/meshtastic/mesh_interface.py +++ b/meshtastic/mesh_interface.py @@ -18,7 +18,7 @@ from pubsub import pub from tabulate import tabulate import meshtastic.node -from meshtastic.pbDefinitions import mesh_pb2, portnums_pb2 +from meshtastic.PbDefinitions import mesh_pb2, portnums_pb2 from meshtastic.__init__ import ( BROADCAST_ADDR, BROADCAST_NUM, @@ -28,7 +28,7 @@ from meshtastic.__init__ import ( protocols, publishingThread, ) -from meshtastic.pbDefinitions import telemetry_pb2 +from meshtastic.PbDefinitions import telemetry_pb2 from meshtastic.util import ( Acknowledgment, Timeout, diff --git a/meshtastic/node.py b/meshtastic/node.py index 1767fb0..43255d7 100644 --- a/meshtastic/node.py +++ b/meshtastic/node.py @@ -7,8 +7,8 @@ import time from google.protobuf.json_format import MessageToJson -from meshtastic.pbDefinitions import admin_pb2, apponly_pb2, channel_pb2, portnums_pb2 -from meshtastic.pbDefinitions import localonly_pb2 +from meshtastic.PbDefinitions import admin_pb2, apponly_pb2, channel_pb2, portnums_pb2 +from meshtastic.PbDefinitions import localonly_pb2 from meshtastic.util import ( Timeout, camel_to_snake, diff --git a/meshtastic/remote_hardware.py b/meshtastic/remote_hardware.py index e157f75..f70db92 100644 --- a/meshtastic/remote_hardware.py +++ b/meshtastic/remote_hardware.py @@ -4,7 +4,7 @@ import logging from pubsub import pub -from meshtastic.pbDefinitions import portnums_pb2, remote_hardware_pb2 +from meshtastic.PbDefinitions import portnums_pb2, remote_hardware_pb2 from meshtastic.util import our_exit diff --git a/meshtastic/tests/test_main.py b/meshtastic/tests/test_main.py index 902aafb..669a463 100644 --- a/meshtastic/tests/test_main.py +++ b/meshtastic/tests/test_main.py @@ -23,7 +23,7 @@ from meshtastic.__main__ import ( tunnelMain, ) -from ..pbDefinitions.channel_pb2 import Channel +from ..PbDefinitions.channel_pb2 import Channel # from ..ble_interface import BLEInterface from ..node import Node diff --git a/meshtastic/tests/test_node.py b/meshtastic/tests/test_node.py index b16f57d..c63b620 100644 --- a/meshtastic/tests/test_node.py +++ b/meshtastic/tests/test_node.py @@ -7,7 +7,7 @@ from unittest.mock import MagicMock, patch import pytest # from ..admin_pb2 import AdminMessage -from ..pbDefinitions.channel_pb2 import Channel +from ..PbDefinitions.channel_pb2 import Channel from ..node import Node from ..serial_interface import SerialInterface diff --git a/meshtastic/tunnel.py b/meshtastic/tunnel.py index 9880305..b0b6e57 100644 --- a/meshtastic/tunnel.py +++ b/meshtastic/tunnel.py @@ -22,7 +22,7 @@ import threading from pubsub import pub from pytap2 import TapDevice -from meshtastic.pbDefinitions import portnums_pb2 +from meshtastic.PbDefinitions import portnums_pb2 from meshtastic.globals import Globals from meshtastic.util import ipstr, readnet_u16 diff --git a/protobufs b/protobufs index 5f28be4..5241583 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 5f28be497a5518334c86378335e8ffcd177ed661 +Subproject commit 5241583565ccbbb4986180bf4c6eb7f8a0dec285