From 8bb570d222a871aede9a4a50c39cc48d4db0d14e Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Mon, 11 Apr 2022 13:17:39 -0700 Subject: [PATCH 1/5] fix smoke1 tests --- Makefile | 4 +++ meshtastic/tests/test_smoke1.py | 52 ++++++++------------------------- 2 files changed, 16 insertions(+), 40 deletions(-) diff --git a/Makefile b/Makefile index 1826382d..1d404f98 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,10 @@ test: virt: pytest -m smokevirt +# run the smoke1 test (after doing a factory reset and unplugging/replugging in device) +smoke1: + pytest -m smoke1 -s -vv + # local install install: pip install . diff --git a/meshtastic/tests/test_smoke1.py b/meshtastic/tests/test_smoke1.py index 7f58dc12..85790514 100644 --- a/meshtastic/tests/test_smoke1.py +++ b/meshtastic/tests/test_smoke1.py @@ -170,20 +170,6 @@ def test_smoke1_port(): assert return_value == 0 -@pytest.mark.smoke1 -def test_smoke1_set_is_router_true(): - """Test --set is_router true""" - return_value, out = subprocess.getstatusoutput('meshtastic --set is_router true') - assert re.match(r'Connected to radio', out) - assert re.search(r'^Set is_router to true', out, re.MULTILINE) - assert return_value == 0 - # pause for the radio - time.sleep(PAUSE_AFTER_COMMAND) - return_value, out = subprocess.getstatusoutput('meshtastic --get is_router') - assert re.search(r'^is_router: True', out, re.MULTILINE) - assert return_value == 0 - - @pytest.mark.smoke1 def test_smoke1_set_location_info(): """Test --setlat, --setlon and --setalt """ @@ -202,20 +188,6 @@ def test_smoke1_set_location_info(): assert return_value == 0 -@pytest.mark.smoke1 -def test_smoke1_set_is_router_false(): - """Test --set is_router false""" - return_value, out = subprocess.getstatusoutput('meshtastic --set is_router false') - assert re.match(r'Connected to radio', out) - assert re.search(r'^Set is_router to false', out, re.MULTILINE) - assert return_value == 0 - # pause for the radio - time.sleep(PAUSE_AFTER_COMMAND) - return_value, out = subprocess.getstatusoutput('meshtastic --get is_router') - assert re.search(r'^is_router: False', out, re.MULTILINE) - assert return_value == 0 - - @pytest.mark.smoke1 def test_smoke1_set_owner(): """Test --set-owner name""" @@ -264,17 +236,17 @@ def test_smoke1_set_team(): @pytest.mark.smoke1 def test_smoke1_ch_values(): - """Test --ch-longslow, --ch-longfast, --ch-mediumslow, --ch-mediumsfast, + """Test --ch-vlongslow --ch-longslow, --ch-longfast, --ch-mediumslow, --ch-mediumsfast, --ch-shortslow, and --ch-shortfast arguments """ exp = { - '--ch-longslow': 'Bw125Cr48Sf4096', - '--ch-longfast': 'Bw31_25Cr48Sf512', - '--ch-mediumslow': 'Bw250Cr46Sf2048', - '--ch-mediumfast': 'Bw250Cr47Sf1024', - # for some reason, this value does not show any modemConfig - '--ch-shortslow': '{ "psk', - '--ch-shortfast': 'Bw500Cr45Sf128' + '--ch-vlongslow': '{ "psk": "AQ==" }', + '--ch-longslow': 'LongSlow', + '--ch-longfast': 'LongFast', + '--ch-midslow': 'MidSlow', + '--ch-midfast': 'MidFast', + '--ch-shortslow': 'ShortSlow', + '--ch-shortfast': 'ShortFast' } for key, val in exp.items(): @@ -587,18 +559,18 @@ def test_smoke1_ch_set_modem_config(): # pause for the radio time.sleep(PAUSE_AFTER_COMMAND) return_value, out = subprocess.getstatusoutput('meshtastic --info') - assert not re.search(r'Bw31_25Cr48Sf512', out, re.MULTILINE) + assert not re.search(r'ShortFast', out, re.MULTILINE) assert return_value == 0 # pause for the radio time.sleep(PAUSE_AFTER_COMMAND) - return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config Bw31_25Cr48Sf512 --ch-index 0') + return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config ShortFast --ch-index 0') assert re.match(r'Connected to radio', out) - assert re.search(r'^Set modem_config to Bw31_25Cr48Sf512', out, re.MULTILINE) + assert re.search(r'^Set modem_config to ShortFast', out, re.MULTILINE) assert return_value == 0 # pause for the radio time.sleep(PAUSE_AFTER_COMMAND) return_value, out = subprocess.getstatusoutput('meshtastic --info') - assert re.search(r'Bw31_25Cr48Sf512', out, re.MULTILINE) + assert re.search(r'ShortFast', out, re.MULTILINE) assert return_value == 0 From 0c924601631a005cffa4b36a7eff32a348932dee Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Mon, 11 Apr 2022 13:58:56 -0700 Subject: [PATCH 2/5] got smoke1 tests to pass --- meshtastic/tests/test_smoke1.py | 48 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/meshtastic/tests/test_smoke1.py b/meshtastic/tests/test_smoke1.py index 85790514..e65f9523 100644 --- a/meshtastic/tests/test_smoke1.py +++ b/meshtastic/tests/test_smoke1.py @@ -234,6 +234,30 @@ def test_smoke1_set_team(): assert return_value == 0 +@pytest.mark.smoke1 +def test_smoke1_ch_set_modem_config(): + """Test --ch-set modem_config""" + return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MidFast') + assert re.search(r'Warning: Need to specify', out, re.MULTILINE) + assert return_value == 1 + # pause for the radio + time.sleep(PAUSE_AFTER_COMMAND) + return_value, out = subprocess.getstatusoutput('meshtastic --info') + assert not re.search(r'MidFast', out, re.MULTILINE) + assert return_value == 0 + # pause for the radio + time.sleep(PAUSE_AFTER_COMMAND) + return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MidFast --ch-index 0') + assert re.match(r'Connected to radio', out) + assert re.search(r'^Set modem_config to MidFast', out, re.MULTILINE) + assert return_value == 0 + # pause for the radio + time.sleep(PAUSE_AFTER_REBOOT) + return_value, out = subprocess.getstatusoutput('meshtastic --info') + assert re.search(r'MidFast', out, re.MULTILINE) + assert return_value == 0 + + @pytest.mark.smoke1 def test_smoke1_ch_values(): """Test --ch-vlongslow --ch-longslow, --ch-longfast, --ch-mediumslow, --ch-mediumsfast, @@ -550,30 +574,6 @@ def test_smoke1_ensure_ch_del_third_of_three_channels(): time.sleep(PAUSE_AFTER_COMMAND) -@pytest.mark.smoke1 -def test_smoke1_ch_set_modem_config(): - """Test --ch-set modem_config""" - return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config Bw31_25Cr48Sf512') - assert re.search(r'Warning: Need to specify', out, re.MULTILINE) - assert return_value == 1 - # pause for the radio - time.sleep(PAUSE_AFTER_COMMAND) - return_value, out = subprocess.getstatusoutput('meshtastic --info') - assert not re.search(r'ShortFast', out, re.MULTILINE) - assert return_value == 0 - # pause for the radio - time.sleep(PAUSE_AFTER_COMMAND) - return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config ShortFast --ch-index 0') - assert re.match(r'Connected to radio', out) - assert re.search(r'^Set modem_config to ShortFast', out, re.MULTILINE) - assert return_value == 0 - # pause for the radio - time.sleep(PAUSE_AFTER_COMMAND) - return_value, out = subprocess.getstatusoutput('meshtastic --info') - assert re.search(r'ShortFast', out, re.MULTILINE) - assert return_value == 0 - - @pytest.mark.smoke1 def test_smoke1_seturl_default(): """Test --seturl with default value""" From 92202807f7614e35383fc5b7a52dc561a9d97600 Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Mon, 11 Apr 2022 14:07:04 -0700 Subject: [PATCH 3/5] update/regen protobufs --- meshtastic/mesh_pb2.py | 60 ++++++---- meshtastic/radioconfig_pb2.py | 213 ++++++++++++++++------------------ 2 files changed, 138 insertions(+), 135 deletions(-) diff --git a/meshtastic/mesh_pb2.py b/meshtastic/mesh_pb2.py index d7e029e5..2a91005f 100644 --- a/meshtastic/mesh_pb2.py +++ b/meshtastic/mesh_pb2.py @@ -21,7 +21,7 @@ package='', syntax='proto3', serialized_options=b'\n\023com.geeksville.meshB\nMeshProtosH\003Z!github.com/meshtastic/gomeshproto', - serialized_pb=b'\n\nmesh.proto\x1a\x0eportnums.proto\x1a\x0ftelemetry.proto\"\xf1\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\t \x01(\x07\x12,\n\x0flocation_source\x18\n \x01(\x0e\x32\x13.Position.LocSource\x12,\n\x0f\x61ltitude_source\x18\x0b \x01(\x0e\x32\x13.Position.AltSource\x12\x15\n\rpos_timestamp\x18\x0c \x01(\x07\x12\x17\n\x0fpos_time_millis\x18\r \x01(\x05\x12\x14\n\x0c\x61ltitude_hae\x18\x0e \x01(\x11\x12\x15\n\ralt_geoid_sep\x18\x0f \x01(\x11\x12\x0c\n\x04PDOP\x18\x10 \x01(\r\x12\x0c\n\x04HDOP\x18\x11 \x01(\r\x12\x0c\n\x04VDOP\x18\x12 \x01(\r\x12\x14\n\x0cgps_accuracy\x18\x13 \x01(\r\x12\x14\n\x0cground_speed\x18\x14 \x01(\r\x12\x14\n\x0cground_track\x18\x15 \x01(\r\x12\x13\n\x0b\x66ix_quality\x18\x16 \x01(\r\x12\x10\n\x08\x66ix_type\x18\x17 \x01(\r\x12\x14\n\x0csats_in_view\x18\x18 \x01(\r\x12\x11\n\tsensor_id\x18\x19 \x01(\r\x12\x17\n\x0fpos_next_update\x18( \x01(\r\x12\x16\n\x0epos_seq_number\x18) \x01(\r\"n\n\tLocSource\x12\x16\n\x12LOCSRC_UNSPECIFIED\x10\x00\x12\x17\n\x13LOCSRC_MANUAL_ENTRY\x10\x01\x12\x17\n\x13LOCSRC_GPS_INTERNAL\x10\x02\x12\x17\n\x13LOCSRC_GPS_EXTERNAL\x10\x03\"\x85\x01\n\tAltSource\x12\x16\n\x12\x41LTSRC_UNSPECIFIED\x10\x00\x12\x17\n\x13\x41LTSRC_MANUAL_ENTRY\x10\x01\x12\x17\n\x13\x41LTSRC_GPS_INTERNAL\x10\x02\x12\x17\n\x13\x41LTSRC_GPS_EXTERNAL\x10\x03\x12\x15\n\x11\x41LTSRC_BAROMETRIC\x10\x04\"\xd7\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\x0f\n\x07macaddr\x18\x04 \x01(\x0c\x12 \n\x08hw_model\x18\x06 \x01(\x0e\x32\x0e.HardwareModel\x12\x13\n\x0bis_licensed\x18\x07 \x01(\x08\x12\x13\n\x04team\x18\x08 \x01(\x0e\x32\x05.Team\x12\x14\n\x0ctx_power_dbm\x18\n \x01(\r\x12\x14\n\x0c\x61nt_gain_dbi\x18\x0b \x01(\r\x12\x13\n\x0b\x61nt_azimuth\x18\x0c \x01(\r\"\x1f\n\x0eRouteDiscovery\x12\r\n\x05route\x18\x02 \x03(\x07\"\xc5\x02\n\x07Routing\x12(\n\rroute_request\x18\x01 \x01(\x0b\x32\x0f.RouteDiscoveryH\x00\x12&\n\x0broute_reply\x18\x02 \x01(\x0b\x32\x0f.RouteDiscoveryH\x00\x12&\n\x0c\x65rror_reason\x18\x03 \x01(\x0e\x32\x0e.Routing.ErrorH\x00\"\xb4\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\x0f\n\x0b\x42\x41\x44_REQUEST\x10 \x12\x12\n\x0eNOT_AUTHORIZED\x10!B\t\n\x07variant\"\xb9\x01\n\x04\x44\x61ta\x12\x19\n\x07portnum\x18\x01 \x01(\x0e\x32\x08.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\x12\x1b\n\x08location\x18\t \x01(\x0b\x32\t.Location\"_\n\x08Location\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\x0e\n\x06locked\x18\x05 \x01(\x08\"\xca\x03\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\x18\n\x07\x64\x65\x63oded\x18\x04 \x01(\x0b\x32\x05.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\n \x01(\r\x12\x10\n\x08want_ack\x18\x0b \x01(\x08\x12&\n\x08priority\x18\x0c \x01(\x0e\x32\x14.MeshPacket.Priority\x12\x0f\n\x07rx_rssi\x18\r \x01(\x05\x12$\n\x07\x64\x65layed\x18\x0f \x01(\x0e\x32\x13.MeshPacket.Delayed\"[\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\x10\n\x0epayloadVariant\"\x89\x01\n\x08NodeInfo\x12\x0b\n\x03num\x18\x01 \x01(\r\x12\x13\n\x04user\x18\x02 \x01(\x0b\x32\x05.User\x12\x1b\n\x08position\x18\x03 \x01(\x0b\x32\t.Position\x12\x0b\n\x03snr\x18\x04 \x01(\x02\x12\x12\n\nlast_heard\x18\x05 \x01(\x07\x12\x1d\n\ttelemetry\x18\x06 \x01(\x0b\x32\n.Telemetry\"\x9a\x03\n\nMyNodeInfo\x12\x13\n\x0bmy_node_num\x18\x01 \x01(\r\x12\x0f\n\x07has_gps\x18\x02 \x01(\x08\x12\x14\n\x0cmax_channels\x18\x0f \x01(\r\x12\x12\n\x06region\x18\x04 \x01(\tB\x02\x18\x01\x12\x18\n\x10\x66irmware_version\x18\x06 \x01(\t\x12&\n\nerror_code\x18\x07 \x01(\x0e\x32\x12.CriticalErrorCode\x12\x15\n\rerror_address\x18\x08 \x01(\r\x12\x13\n\x0b\x65rror_count\x18\t \x01(\r\x12\x14\n\x0creboot_count\x18\n \x01(\r\x12\x0f\n\x07\x62itrate\x18\x0b \x01(\x02\x12\x1c\n\x14message_timeout_msec\x18\r \x01(\r\x12\x17\n\x0fmin_app_version\x18\x0e \x01(\r\x12\x15\n\rair_period_tx\x18\x10 \x03(\r\x12\x15\n\rair_period_rx\x18\x11 \x03(\r\x12\x10\n\x08has_wifi\x18\x12 \x01(\x08\x12\x1b\n\x13\x63hannel_utilization\x18\x13 \x01(\x02\x12\x13\n\x0b\x61ir_util_tx\x18\x14 \x01(\x02\"\xb5\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\x1f\n\x05level\x18\x04 \x01(\x0e\x32\x10.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\"\xe8\x01\n\tFromRadio\x12\n\n\x02id\x18\x01 \x01(\r\x12\x1d\n\x06packet\x18\x0b \x01(\x0b\x32\x0b.MeshPacketH\x00\x12\x1e\n\x07my_info\x18\x03 \x01(\x0b\x32\x0b.MyNodeInfoH\x00\x12\x1e\n\tnode_info\x18\x04 \x01(\x0b\x32\t.NodeInfoH\x00\x12 \n\nlog_record\x18\x07 \x01(\x0b\x32\n.LogRecordH\x00\x12\x1c\n\x12\x63onfig_complete_id\x18\x08 \x01(\rH\x00\x12\x12\n\x08rebooted\x18\t \x01(\x08H\x00\x42\x10\n\x0epayloadVariantJ\x04\x08\x02\x10\x03J\x04\x08\x06\x10\x07\"\xe1\x01\n\x07ToRadio\x12\x1d\n\x06packet\x18\x02 \x01(\x0b\x32\x0b.MeshPacketH\x00\x12&\n\tpeer_info\x18\x03 \x01(\x0b\x32\x11.ToRadio.PeerInfoH\x00\x12\x18\n\x0ewant_config_id\x18\x64 \x01(\rH\x00\x12\x14\n\ndisconnect\x18h \x01(\x08H\x00\x1a\x35\n\x08PeerInfo\x12\x13\n\x0b\x61pp_version\x18\x01 \x01(\r\x12\x14\n\x0cmqtt_gateway\x18\x02 \x01(\x08\x42\x10\n\x0epayloadVariantJ\x04\x08\x01\x10\x02J\x04\x08\x65\x10\x66J\x04\x08\x66\x10gJ\x04\x08g\x10h*\xda\x02\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\x0c\n\x08TBEAM0p7\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\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\x0c\n\x08RAK11200\x10(\x12\x0f\n\nPRIVATE_HW\x10\xff\x01*\xb5\x01\n\x04Team\x12\t\n\x05\x43LEAR\x10\x00\x12\x08\n\x04\x43YAN\x10\x01\x12\t\n\x05WHITE\x10\x02\x12\n\n\x06YELLOW\x10\x03\x12\n\n\x06ORANGE\x10\x04\x12\x0b\n\x07MAGENTA\x10\x05\x12\x07\n\x03RED\x10\x06\x12\n\n\x06MAROON\x10\x07\x12\n\n\x06PURPLE\x10\x08\x12\r\n\tDARK_BLUE\x10\t\x12\x08\n\x04\x42LUE\x10\n\x12\x08\n\x04TEAL\x10\x0b\x12\t\n\x05GREEN\x10\x0c\x12\x0e\n\nDARK_GREEN\x10\r\x12\t\n\x05\x42ROWN\x10\x0e*.\n\tConstants\x12\n\n\x06Unused\x10\x00\x12\x15\n\x10\x44\x41TA_PAYLOAD_LEN\x10\xed\x01*\xe1\x01\n\x11\x43riticalErrorCode\x12\x08\n\x04None\x10\x00\x12\x0e\n\nTxWatchdog\x10\x01\x12\x12\n\x0eSleepEnterWait\x10\x02\x12\x0b\n\x07NoRadio\x10\x03\x12\x0f\n\x0bUnspecified\x10\x04\x12\x13\n\x0fUBloxInitFailed\x10\x05\x12\x0c\n\x08NoAXP192\x10\x06\x12\x17\n\x13InvalidRadioSetting\x10\x07\x12\x12\n\x0eTransmitFailed\x10\x08\x12\x0c\n\x08\x42rownout\x10\t\x12\x11\n\rSX1262Failure\x10\n\x12\x0f\n\x0bRadioSpiBug\x10\x0b\x42\x46\n\x13\x63om.geeksville.meshB\nMeshProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' + serialized_pb=b'\n\nmesh.proto\x1a\x0eportnums.proto\x1a\x0ftelemetry.proto\"\xf1\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\t \x01(\x07\x12,\n\x0flocation_source\x18\n \x01(\x0e\x32\x13.Position.LocSource\x12,\n\x0f\x61ltitude_source\x18\x0b \x01(\x0e\x32\x13.Position.AltSource\x12\x15\n\rpos_timestamp\x18\x0c \x01(\x07\x12\x17\n\x0fpos_time_millis\x18\r \x01(\x05\x12\x14\n\x0c\x61ltitude_hae\x18\x0e \x01(\x11\x12\x15\n\ralt_geoid_sep\x18\x0f \x01(\x11\x12\x0c\n\x04PDOP\x18\x10 \x01(\r\x12\x0c\n\x04HDOP\x18\x11 \x01(\r\x12\x0c\n\x04VDOP\x18\x12 \x01(\r\x12\x14\n\x0cgps_accuracy\x18\x13 \x01(\r\x12\x14\n\x0cground_speed\x18\x14 \x01(\r\x12\x14\n\x0cground_track\x18\x15 \x01(\r\x12\x13\n\x0b\x66ix_quality\x18\x16 \x01(\r\x12\x10\n\x08\x66ix_type\x18\x17 \x01(\r\x12\x14\n\x0csats_in_view\x18\x18 \x01(\r\x12\x11\n\tsensor_id\x18\x19 \x01(\r\x12\x17\n\x0fpos_next_update\x18( \x01(\r\x12\x16\n\x0epos_seq_number\x18) \x01(\r\"n\n\tLocSource\x12\x16\n\x12LOCSRC_UNSPECIFIED\x10\x00\x12\x17\n\x13LOCSRC_MANUAL_ENTRY\x10\x01\x12\x17\n\x13LOCSRC_GPS_INTERNAL\x10\x02\x12\x17\n\x13LOCSRC_GPS_EXTERNAL\x10\x03\"\x85\x01\n\tAltSource\x12\x16\n\x12\x41LTSRC_UNSPECIFIED\x10\x00\x12\x17\n\x13\x41LTSRC_MANUAL_ENTRY\x10\x01\x12\x17\n\x13\x41LTSRC_GPS_INTERNAL\x10\x02\x12\x17\n\x13\x41LTSRC_GPS_EXTERNAL\x10\x03\x12\x15\n\x11\x41LTSRC_BAROMETRIC\x10\x04\"\xd7\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\x0f\n\x07macaddr\x18\x04 \x01(\x0c\x12 \n\x08hw_model\x18\x06 \x01(\x0e\x32\x0e.HardwareModel\x12\x13\n\x0bis_licensed\x18\x07 \x01(\x08\x12\x13\n\x04team\x18\x08 \x01(\x0e\x32\x05.Team\x12\x14\n\x0ctx_power_dbm\x18\n \x01(\r\x12\x14\n\x0c\x61nt_gain_dbi\x18\x0b \x01(\r\x12\x13\n\x0b\x61nt_azimuth\x18\x0c \x01(\r\"\x1f\n\x0eRouteDiscovery\x12\r\n\x05route\x18\x02 \x03(\x07\"\xc5\x02\n\x07Routing\x12(\n\rroute_request\x18\x01 \x01(\x0b\x32\x0f.RouteDiscoveryH\x00\x12&\n\x0broute_reply\x18\x02 \x01(\x0b\x32\x0f.RouteDiscoveryH\x00\x12&\n\x0c\x65rror_reason\x18\x03 \x01(\x0e\x32\x0e.Routing.ErrorH\x00\"\xb4\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\x0f\n\x0b\x42\x41\x44_REQUEST\x10 \x12\x12\n\x0eNOT_AUTHORIZED\x10!B\t\n\x07variant\"\xb9\x01\n\x04\x44\x61ta\x12\x19\n\x07portnum\x18\x01 \x01(\x0e\x32\x08.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\x12\x1b\n\x08location\x18\t \x01(\x0b\x32\t.Location\"_\n\x08Location\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\x0e\n\x06locked\x18\x05 \x01(\x08\"\xca\x03\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\x18\n\x07\x64\x65\x63oded\x18\x04 \x01(\x0b\x32\x05.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\n \x01(\r\x12\x10\n\x08want_ack\x18\x0b \x01(\x08\x12&\n\x08priority\x18\x0c \x01(\x0e\x32\x14.MeshPacket.Priority\x12\x0f\n\x07rx_rssi\x18\r \x01(\x05\x12$\n\x07\x64\x65layed\x18\x0f \x01(\x0e\x32\x13.MeshPacket.Delayed\"[\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\x10\n\x0epayloadVariant\"\x92\x01\n\x08NodeInfo\x12\x0b\n\x03num\x18\x01 \x01(\r\x12\x13\n\x04user\x18\x02 \x01(\x0b\x32\x05.User\x12\x1b\n\x08position\x18\x03 \x01(\x0b\x32\t.Position\x12\x0b\n\x03snr\x18\x04 \x01(\x02\x12\x12\n\nlast_heard\x18\x05 \x01(\x07\x12&\n\x0e\x64\x65vice_metrics\x18\x06 \x01(\x0b\x32\x0e.DeviceMetrics\"\x9a\x03\n\nMyNodeInfo\x12\x13\n\x0bmy_node_num\x18\x01 \x01(\r\x12\x0f\n\x07has_gps\x18\x02 \x01(\x08\x12\x14\n\x0cmax_channels\x18\x0f \x01(\r\x12\x12\n\x06region\x18\x04 \x01(\tB\x02\x18\x01\x12\x18\n\x10\x66irmware_version\x18\x06 \x01(\t\x12&\n\nerror_code\x18\x07 \x01(\x0e\x32\x12.CriticalErrorCode\x12\x15\n\rerror_address\x18\x08 \x01(\r\x12\x13\n\x0b\x65rror_count\x18\t \x01(\r\x12\x14\n\x0creboot_count\x18\n \x01(\r\x12\x0f\n\x07\x62itrate\x18\x0b \x01(\x02\x12\x1c\n\x14message_timeout_msec\x18\r \x01(\r\x12\x17\n\x0fmin_app_version\x18\x0e \x01(\r\x12\x15\n\rair_period_tx\x18\x10 \x03(\r\x12\x15\n\rair_period_rx\x18\x11 \x03(\r\x12\x10\n\x08has_wifi\x18\x12 \x01(\x08\x12\x1b\n\x13\x63hannel_utilization\x18\x13 \x01(\x02\x12\x13\n\x0b\x61ir_util_tx\x18\x14 \x01(\x02\"\xb5\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\x1f\n\x05level\x18\x04 \x01(\x0e\x32\x10.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\"\xe8\x01\n\tFromRadio\x12\n\n\x02id\x18\x01 \x01(\r\x12\x1d\n\x06packet\x18\x0b \x01(\x0b\x32\x0b.MeshPacketH\x00\x12\x1e\n\x07my_info\x18\x03 \x01(\x0b\x32\x0b.MyNodeInfoH\x00\x12\x1e\n\tnode_info\x18\x04 \x01(\x0b\x32\t.NodeInfoH\x00\x12 \n\nlog_record\x18\x07 \x01(\x0b\x32\n.LogRecordH\x00\x12\x1c\n\x12\x63onfig_complete_id\x18\x08 \x01(\rH\x00\x12\x12\n\x08rebooted\x18\t \x01(\x08H\x00\x42\x10\n\x0epayloadVariantJ\x04\x08\x02\x10\x03J\x04\x08\x06\x10\x07\"\xe1\x01\n\x07ToRadio\x12\x1d\n\x06packet\x18\x02 \x01(\x0b\x32\x0b.MeshPacketH\x00\x12&\n\tpeer_info\x18\x03 \x01(\x0b\x32\x11.ToRadio.PeerInfoH\x00\x12\x18\n\x0ewant_config_id\x18\x64 \x01(\rH\x00\x12\x14\n\ndisconnect\x18h \x01(\x08H\x00\x1a\x35\n\x08PeerInfo\x12\x13\n\x0b\x61pp_version\x18\x01 \x01(\r\x12\x14\n\x0cmqtt_gateway\x18\x02 \x01(\x08\x42\x10\n\x0epayloadVariantJ\x04\x08\x01\x10\x02J\x04\x08\x65\x10\x66J\x04\x08\x66\x10gJ\x04\x08g\x10h*\xfe\x02\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\x0c\n\x08TBEAM0p7\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\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\x0c\n\x08RAK11200\x10(\x12\x0b\n\x07NANO_G1\x10)\x12\x15\n\x11NRF52840_PCA10059\x10*\x12\x0f\n\nPRIVATE_HW\x10\xff\x01*\xb5\x01\n\x04Team\x12\t\n\x05\x43LEAR\x10\x00\x12\x08\n\x04\x43YAN\x10\x01\x12\t\n\x05WHITE\x10\x02\x12\n\n\x06YELLOW\x10\x03\x12\n\n\x06ORANGE\x10\x04\x12\x0b\n\x07MAGENTA\x10\x05\x12\x07\n\x03RED\x10\x06\x12\n\n\x06MAROON\x10\x07\x12\n\n\x06PURPLE\x10\x08\x12\r\n\tDARK_BLUE\x10\t\x12\x08\n\x04\x42LUE\x10\n\x12\x08\n\x04TEAL\x10\x0b\x12\t\n\x05GREEN\x10\x0c\x12\x0e\n\nDARK_GREEN\x10\r\x12\t\n\x05\x42ROWN\x10\x0e*.\n\tConstants\x12\n\n\x06Unused\x10\x00\x12\x15\n\x10\x44\x41TA_PAYLOAD_LEN\x10\xed\x01*\xe1\x01\n\x11\x43riticalErrorCode\x12\x08\n\x04None\x10\x00\x12\x0e\n\nTxWatchdog\x10\x01\x12\x12\n\x0eSleepEnterWait\x10\x02\x12\x0b\n\x07NoRadio\x10\x03\x12\x0f\n\x0bUnspecified\x10\x04\x12\x13\n\x0fUBloxInitFailed\x10\x05\x12\x0c\n\x08NoAXP192\x10\x06\x12\x17\n\x13InvalidRadioSetting\x10\x07\x12\x12\n\x0eTransmitFailed\x10\x08\x12\x0c\n\x08\x42rownout\x10\t\x12\x11\n\rSX1262Failure\x10\n\x12\x0f\n\x0bRadioSpiBug\x10\x0b\x42\x46\n\x13\x63om.geeksville.meshB\nMeshProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' , dependencies=[portnums__pb2.DESCRIPTOR,telemetry__pb2.DESCRIPTOR,]) @@ -116,14 +116,22 @@ serialized_options=None, type=None), _descriptor.EnumValueDescriptor( - name='PRIVATE_HW', index=21, number=255, + name='NANO_G1', index=21, number=41, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='NRF52840_PCA10059', index=22, number=42, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='PRIVATE_HW', index=23, number=255, serialized_options=None, type=None), ], containing_type=None, serialized_options=None, - serialized_start=3329, - serialized_end=3675, + serialized_start=3338, + serialized_end=3720, ) _sym_db.RegisterEnumDescriptor(_HARDWAREMODEL) @@ -197,8 +205,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3678, - serialized_end=3859, + serialized_start=3723, + serialized_end=3904, ) _sym_db.RegisterEnumDescriptor(_TEAM) @@ -220,8 +228,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3861, - serialized_end=3907, + serialized_start=3906, + serialized_end=3952, ) _sym_db.RegisterEnumDescriptor(_CONSTANTS) @@ -283,8 +291,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3910, - serialized_end=4135, + serialized_start=3955, + serialized_end=4180, ) _sym_db.RegisterEnumDescriptor(_CRITICALERRORCODE) @@ -310,6 +318,8 @@ ANDROID_SIM = 38 DIY_V1 = 39 RAK11200 = 40 +NANO_G1 = 41 +NRF52840_PCA10059 = 42 PRIVATE_HW = 255 CLEAR = 0 CYAN = 1 @@ -569,8 +579,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=2775, - serialized_end=2863, + serialized_start=2784, + serialized_end=2872, ) _sym_db.RegisterEnumDescriptor(_LOGRECORD_LEVEL) @@ -1238,7 +1248,7 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='telemetry', full_name='NodeInfo.telemetry', index=5, + name='device_metrics', full_name='NodeInfo.device_metrics', index=5, number=6, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -1257,7 +1267,7 @@ oneofs=[ ], serialized_start=2129, - serialized_end=2266, + serialized_end=2275, ) @@ -1399,8 +1409,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2269, - serialized_end=2679, + serialized_start=2278, + serialized_end=2688, ) @@ -1452,8 +1462,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2682, - serialized_end=2863, + serialized_start=2691, + serialized_end=2872, ) @@ -1528,8 +1538,8 @@ name='payloadVariant', full_name='FromRadio.payloadVariant', index=0, containing_type=None, fields=[]), ], - serialized_start=2866, - serialized_end=3098, + serialized_start=2875, + serialized_end=3107, ) @@ -1566,8 +1576,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3231, - serialized_end=3284, + serialized_start=3240, + serialized_end=3293, ) _TORADIO = _descriptor.Descriptor( @@ -1620,8 +1630,8 @@ name='payloadVariant', full_name='ToRadio.payloadVariant', index=0, containing_type=None, fields=[]), ], - serialized_start=3101, - serialized_end=3326, + serialized_start=3110, + serialized_end=3335, ) _POSITION.fields_by_name['location_source'].enum_type = _POSITION_LOCSOURCE @@ -1658,7 +1668,7 @@ _MESHPACKET.fields_by_name['encrypted'].containing_oneof = _MESHPACKET.oneofs_by_name['payloadVariant'] _NODEINFO.fields_by_name['user'].message_type = _USER _NODEINFO.fields_by_name['position'].message_type = _POSITION -_NODEINFO.fields_by_name['telemetry'].message_type = telemetry__pb2._TELEMETRY +_NODEINFO.fields_by_name['device_metrics'].message_type = telemetry__pb2._DEVICEMETRICS _MYNODEINFO.fields_by_name['error_code'].enum_type = _CRITICALERRORCODE _LOGRECORD.fields_by_name['level'].enum_type = _LOGRECORD_LEVEL _LOGRECORD_LEVEL.containing_type = _LOGRECORD diff --git a/meshtastic/radioconfig_pb2.py b/meshtastic/radioconfig_pb2.py index d78e1a35..b9ac7abd 100644 --- a/meshtastic/radioconfig_pb2.py +++ b/meshtastic/radioconfig_pb2.py @@ -19,7 +19,7 @@ package='', syntax='proto3', serialized_options=b'\n\023com.geeksville.meshB\021RadioConfigProtosH\003Z!github.com/meshtastic/gomeshproto', - serialized_pb=b'\n\x11radioconfig.proto\"\xd8\x1b\n\x0bRadioConfig\x12\x31\n\x0bpreferences\x18\x01 \x01(\x0b\x32\x1c.RadioConfig.UserPreferences\x1a\x95\x1b\n\x0fUserPreferences\x12\x1f\n\x17position_broadcast_secs\x18\x01 \x01(\r\x12)\n!position_broadcast_smart_disabled\x18\x11 \x01(\x08\x12\x1b\n\x13send_owner_interval\x18\x02 \x01(\r\x12\x1b\n\x13wait_bluetooth_secs\x18\x04 \x01(\r\x12\x16\n\x0escreen_on_secs\x18\x05 \x01(\r\x12\x1a\n\x12phone_timeout_secs\x18\x06 \x01(\r\x12\x1d\n\x15phone_sds_timeout_sec\x18\x07 \x01(\r\x12\x1d\n\x15mesh_sds_timeout_secs\x18\x08 \x01(\r\x12\x10\n\x08sds_secs\x18\t \x01(\r\x12\x0f\n\x07ls_secs\x18\n \x01(\r\x12\x15\n\rmin_wake_secs\x18\x0b \x01(\r\x12\x11\n\twifi_ssid\x18\x0c \x01(\t\x12\x15\n\rwifi_password\x18\r \x01(\t\x12\x14\n\x0cwifi_ap_mode\x18\x0e \x01(\x08\x12\x1b\n\x06region\x18\x0f \x01(\x0e\x32\x0b.RegionCode\x12&\n\x0e\x63harge_current\x18\x10 \x01(\x0e\x32\x0e.ChargeCurrent\x12\x13\n\x04role\x18\x12 \x01(\x0e\x32\x05.Role\x12\x14\n\x0cis_low_power\x18& \x01(\x08\x12\x16\n\x0e\x66ixed_position\x18\' \x01(\x08\x12\x17\n\x0fserial_disabled\x18( \x01(\x08\x12\x1f\n\x17location_share_disabled\x18 \x01(\x08\x12\x14\n\x0cgps_disabled\x18! \x01(\x08\x12\x1b\n\x13gps_update_interval\x18\" \x01(\r\x12\x18\n\x10gps_attempt_time\x18$ \x01(\r\x12\x15\n\rgps_accept_2d\x18- \x01(\x08\x12\x13\n\x0bgps_max_dop\x18. \x01(\r\x12\x18\n\x10\x66requency_offset\x18) \x01(\x02\x12\x13\n\x0bmqtt_server\x18* \x01(\t\x12\x15\n\rmqtt_disabled\x18+ \x01(\x08\x12(\n\ngps_format\x18, \x01(\x0e\x32\x14.GpsCoordinateFormat\x12\x15\n\rfactory_reset\x18\x64 \x01(\x08\x12\x19\n\x11\x64\x65\x62ug_log_enabled\x18\x65 \x01(\x08\x12\x17\n\x0fignore_incoming\x18g \x03(\r\x12\x1d\n\x15serial_module_enabled\x18x \x01(\x08\x12\x1a\n\x12serial_module_echo\x18y \x01(\x08\x12\x19\n\x11serial_module_rxd\x18z \x01(\r\x12\x19\n\x11serial_module_txd\x18{ \x01(\r\x12\x45\n\x12serial_module_baud\x18\xb0\x01 \x01(\x0e\x32(.RadioConfig.UserPreferences.Serial_Baud\x12\x1d\n\x15serial_module_timeout\x18| \x01(\r\x12\x44\n\x12serial_module_mode\x18} \x01(\x0e\x32(.RadioConfig.UserPreferences.Serial_Mode\x12\'\n\x1f\x65xt_notification_module_enabled\x18~ \x01(\x08\x12)\n!ext_notification_module_output_ms\x18\x7f \x01(\r\x12\'\n\x1e\x65xt_notification_module_output\x18\x80\x01 \x01(\r\x12\'\n\x1e\x65xt_notification_module_active\x18\x81\x01 \x01(\x08\x12.\n%ext_notification_module_alert_message\x18\x82\x01 \x01(\x08\x12+\n\"ext_notification_module_alert_bell\x18\x83\x01 \x01(\x08\x12\"\n\x19range_test_module_enabled\x18\x84\x01 \x01(\x08\x12!\n\x18range_test_module_sender\x18\x85\x01 \x01(\r\x12\x1f\n\x16range_test_module_save\x18\x86\x01 \x01(\x08\x12%\n\x1cstore_forward_module_enabled\x18\x94\x01 \x01(\x08\x12\'\n\x1estore_forward_module_heartbeat\x18\x95\x01 \x01(\x08\x12%\n\x1cstore_forward_module_records\x18\x89\x01 \x01(\r\x12\x30\n\'store_forward_module_history_return_max\x18\x8a\x01 \x01(\r\x12\x33\n*store_forward_module_history_return_window\x18\x8b\x01 \x01(\r\x12\x39\n0telemetry_module_environment_measurement_enabled\x18\x8c\x01 \x01(\x08\x12\x34\n+telemetry_module_environment_screen_enabled\x18\x8d\x01 \x01(\x08\x12@\n7telemetry_module_environment_read_error_count_threshold\x18\x8e\x01 \x01(\r\x12\x30\n\'telemetry_module_device_update_interval\x18\x8f\x01 \x01(\r\x12\x37\n.telemetry_module_environment_recovery_interval\x18\x90\x01 \x01(\r\x12\x38\n/telemetry_module_environment_display_fahrenheit\x18\x91\x01 \x01(\x08\x12\x63\n(telemetry_module_environment_sensor_type\x18\x92\x01 \x01(\x0e\x32\x30.RadioConfig.UserPreferences.TelemetrySensorType\x12\x30\n\'telemetry_module_environment_sensor_pin\x18\x93\x01 \x01(\r\x12\x17\n\x0eposition_flags\x18\x96\x01 \x01(\r\x12\x1a\n\x11is_always_powered\x18\x97\x01 \x01(\x08\x12\"\n\x19\x61uto_screen_carousel_secs\x18\x98\x01 \x01(\r\x12\'\n\x1eon_battery_shutdown_after_secs\x18\x99\x01 \x01(\r\x12\x12\n\thop_limit\x18\x9a\x01 \x01(\r\x12\x16\n\rmqtt_username\x18\x9b\x01 \x01(\t\x12\x16\n\rmqtt_password\x18\x9c\x01 \x01(\t\x12\x1c\n\x13is_lora_tx_disabled\x18\x9d\x01 \x01(\x08\x12\x18\n\x0fis_power_saving\x18\x9e\x01 \x01(\x08\x12\x18\n\x0frotary1_enabled\x18\xa0\x01 \x01(\x08\x12\x1a\n\x11inputbroker_pin_a\x18\xa1\x01 \x01(\r\x12\x1a\n\x11inputbroker_pin_b\x18\xa2\x01 \x01(\r\x12\x1e\n\x15inputbroker_pin_press\x18\xa3\x01 \x01(\r\x12.\n\x14inputbroker_event_cw\x18\xa4\x01 \x01(\x0e\x32\x0f.InputEventChar\x12/\n\x15inputbroker_event_ccw\x18\xa5\x01 \x01(\x0e\x32\x0f.InputEventChar\x12\x31\n\x17inputbroker_event_press\x18\xa6\x01 \x01(\x0e\x32\x0f.InputEventChar\x12\x18\n\x0fupdown1_enabled\x18\xa7\x01 \x01(\x08\x12&\n\x1d\x63\x61nned_message_module_enabled\x18\xaa\x01 \x01(\x08\x12\x31\n(canned_message_module_allow_input_source\x18\xab\x01 \x01(\t\x12(\n\x1f\x63\x61nned_message_module_send_bell\x18\xad\x01 \x01(\x08\x12 \n\x17mqtt_encryption_enabled\x18\xae\x01 \x01(\x08\x12 \n\x17\x61\x64\x63_multiplier_override\x18\xaf\x01 \x01(\x02\x12\x35\n,telemetry_module_environment_update_interval\x18\xb1\x01 \x01(\r\"\xd1\x01\n\x0bSerial_Baud\x12\x10\n\x0c\x42\x41UD_Default\x10\x00\x12\r\n\tBAUD_2400\x10\x01\x12\r\n\tBAUD_4800\x10\x02\x12\r\n\tBAUD_9600\x10\x03\x12\x0e\n\nBAUD_19200\x10\x04\x12\x0e\n\nBAUD_38400\x10\x05\x12\x0e\n\nBAUD_57600\x10\x06\x12\x0f\n\x0b\x42\x41UD_115200\x10\x07\x12\x0f\n\x0b\x42\x41UD_230400\x10\x08\x12\x0f\n\x0b\x42\x41UD_460800\x10\t\x12\x0f\n\x0b\x42\x41UD_576000\x10\n\x12\x0f\n\x0b\x42\x41UD_921600\x10\x0b\"@\n\x0bSerial_Mode\x12\x10\n\x0cMODE_Default\x10\x00\x12\x0f\n\x0bMODE_SIMPLE\x10\x01\x12\x0e\n\nMODE_PROTO\x10\x02\"\x88\x01\n\x13TelemetrySensorType\x12\x08\n\x04None\x10\x00\x12\t\n\x05\x44HT11\x10\x01\x12\x0b\n\x07\x44S18B20\x10\x02\x12\t\n\x05\x44HT12\x10\x03\x12\t\n\x05\x44HT21\x10\x04\x12\t\n\x05\x44HT22\x10\x05\x12\n\n\x06\x42ME280\x10\x06\x12\n\n\x06\x42ME680\x10\x07\x12\x0b\n\x07MCP9808\x10\x08\x12\t\n\x05SHTC3\x10\tJ\x06\x08\x88\x01\x10\x89\x01*\x81\x01\n\nRegionCode\x12\t\n\x05Unset\x10\x00\x12\x06\n\x02US\x10\x01\x12\t\n\x05\x45U433\x10\x02\x12\t\n\x05\x45U868\x10\x03\x12\x06\n\x02\x43N\x10\x04\x12\x06\n\x02JP\x10\x05\x12\x07\n\x03\x41NZ\x10\x06\x12\x06\n\x02KR\x10\x07\x12\x06\n\x02TW\x10\x08\x12\x06\n\x02RU\x10\t\x12\x06\n\x02IN\x10\n\x12\t\n\x05NZ865\x10\x0b\x12\x06\n\x02TH\x10\x0c*@\n\x04Role\x12\n\n\x06\x43lient\x10\x00\x12\x0e\n\nClientMute\x10\x01\x12\n\n\x06Router\x10\x02\x12\x10\n\x0cRouterClient\x10\x03*\xd1\x01\n\rChargeCurrent\x12\x0b\n\x07MAUnset\x10\x00\x12\t\n\x05MA100\x10\x01\x12\t\n\x05MA190\x10\x02\x12\t\n\x05MA280\x10\x03\x12\t\n\x05MA360\x10\x04\x12\t\n\x05MA450\x10\x05\x12\t\n\x05MA550\x10\x06\x12\t\n\x05MA630\x10\x07\x12\t\n\x05MA700\x10\x08\x12\t\n\x05MA780\x10\t\x12\t\n\x05MA880\x10\n\x12\t\n\x05MA960\x10\x0b\x12\n\n\x06MA1000\x10\x0c\x12\n\n\x06MA1080\x10\r\x12\n\n\x06MA1160\x10\x0e\x12\n\n\x06MA1240\x10\x0f\x12\n\n\x06MA1320\x10\x10*\x83\x01\n\x13GpsCoordinateFormat\x12\x10\n\x0cGpsFormatDec\x10\x00\x12\x10\n\x0cGpsFormatDMS\x10\x01\x12\x10\n\x0cGpsFormatUTM\x10\x02\x12\x11\n\rGpsFormatMGRS\x10\x03\x12\x10\n\x0cGpsFormatOLC\x10\x04\x12\x11\n\rGpsFormatOSGR\x10\x05*\xbc\x01\n\rPositionFlags\x12\x11\n\rPOS_UNDEFINED\x10\x00\x12\x10\n\x0cPOS_ALTITUDE\x10\x01\x12\x0f\n\x0bPOS_ALT_MSL\x10\x02\x12\x0f\n\x0bPOS_GEO_SEP\x10\x04\x12\x0b\n\x07POS_DOP\x10\x08\x12\r\n\tPOS_HVDOP\x10\x10\x12\x0f\n\x0bPOS_BATTERY\x10 \x12\x11\n\rPOS_SATINVIEW\x10@\x12\x10\n\x0bPOS_SEQ_NOS\x10\x80\x01\x12\x12\n\rPOS_TIMESTAMP\x10\x80\x02*\x83\x01\n\x0eInputEventChar\x12\x0c\n\x08KEY_NONE\x10\x00\x12\n\n\x06KEY_UP\x10\x11\x12\x0c\n\x08KEY_DOWN\x10\x12\x12\x0c\n\x08KEY_LEFT\x10\x13\x12\r\n\tKEY_RIGHT\x10\x14\x12\x0e\n\nKEY_SELECT\x10\n\x12\x0c\n\x08KEY_BACK\x10\x1b\x12\x0e\n\nKEY_CANCEL\x10\x18\x42M\n\x13\x63om.geeksville.meshB\x11RadioConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' + serialized_pb=b'\n\x11radioconfig.proto\"\xbb\x1b\n\x0bRadioConfig\x12\x31\n\x0bpreferences\x18\x01 \x01(\x0b\x32\x1c.RadioConfig.UserPreferences\x1a\xf8\x1a\n\x0fUserPreferences\x12\x1f\n\x17position_broadcast_secs\x18\x01 \x01(\r\x12)\n!position_broadcast_smart_disabled\x18\x11 \x01(\x08\x12\x1b\n\x13wait_bluetooth_secs\x18\x04 \x01(\r\x12\x16\n\x0escreen_on_secs\x18\x05 \x01(\r\x12\x1a\n\x12phone_timeout_secs\x18\x06 \x01(\r\x12\x1d\n\x15phone_sds_timeout_sec\x18\x07 \x01(\r\x12\x1d\n\x15mesh_sds_timeout_secs\x18\x08 \x01(\r\x12\x10\n\x08sds_secs\x18\t \x01(\r\x12\x0f\n\x07ls_secs\x18\n \x01(\r\x12\x15\n\rmin_wake_secs\x18\x0b \x01(\r\x12\x11\n\twifi_ssid\x18\x0c \x01(\t\x12\x15\n\rwifi_password\x18\r \x01(\t\x12\x14\n\x0cwifi_ap_mode\x18\x0e \x01(\x08\x12\x1b\n\x06region\x18\x0f \x01(\x0e\x32\x0b.RegionCode\x12&\n\x0e\x63harge_current\x18\x10 \x01(\x0e\x32\x0e.ChargeCurrent\x12\x13\n\x04role\x18\x12 \x01(\x0e\x32\x05.Role\x12\x14\n\x0cis_low_power\x18& \x01(\x08\x12\x16\n\x0e\x66ixed_position\x18\' \x01(\x08\x12\x17\n\x0fserial_disabled\x18( \x01(\x08\x12\x1f\n\x17location_share_disabled\x18 \x01(\x08\x12\x14\n\x0cgps_disabled\x18! \x01(\x08\x12\x1b\n\x13gps_update_interval\x18\" \x01(\r\x12\x18\n\x10gps_attempt_time\x18$ \x01(\r\x12\x15\n\rgps_accept_2d\x18- \x01(\x08\x12\x13\n\x0bgps_max_dop\x18. \x01(\r\x12\x18\n\x10\x66requency_offset\x18) \x01(\x02\x12\x13\n\x0bmqtt_server\x18* \x01(\t\x12\x15\n\rmqtt_disabled\x18+ \x01(\x08\x12(\n\ngps_format\x18, \x01(\x0e\x32\x14.GpsCoordinateFormat\x12\x15\n\rfactory_reset\x18\x64 \x01(\x08\x12\x19\n\x11\x64\x65\x62ug_log_enabled\x18\x65 \x01(\x08\x12\x17\n\x0fignore_incoming\x18g \x03(\r\x12\x1d\n\x15serial_module_enabled\x18x \x01(\x08\x12\x1a\n\x12serial_module_echo\x18y \x01(\x08\x12\x19\n\x11serial_module_rxd\x18z \x01(\r\x12\x19\n\x11serial_module_txd\x18{ \x01(\r\x12\x45\n\x12serial_module_baud\x18\xb0\x01 \x01(\x0e\x32(.RadioConfig.UserPreferences.Serial_Baud\x12\x1d\n\x15serial_module_timeout\x18| \x01(\r\x12\x44\n\x12serial_module_mode\x18} \x01(\x0e\x32(.RadioConfig.UserPreferences.Serial_Mode\x12\'\n\x1f\x65xt_notification_module_enabled\x18~ \x01(\x08\x12)\n!ext_notification_module_output_ms\x18\x7f \x01(\r\x12\'\n\x1e\x65xt_notification_module_output\x18\x80\x01 \x01(\r\x12\'\n\x1e\x65xt_notification_module_active\x18\x81\x01 \x01(\x08\x12.\n%ext_notification_module_alert_message\x18\x82\x01 \x01(\x08\x12+\n\"ext_notification_module_alert_bell\x18\x83\x01 \x01(\x08\x12\"\n\x19range_test_module_enabled\x18\x84\x01 \x01(\x08\x12!\n\x18range_test_module_sender\x18\x85\x01 \x01(\r\x12\x1f\n\x16range_test_module_save\x18\x86\x01 \x01(\x08\x12%\n\x1cstore_forward_module_enabled\x18\x94\x01 \x01(\x08\x12\'\n\x1estore_forward_module_heartbeat\x18\x95\x01 \x01(\x08\x12%\n\x1cstore_forward_module_records\x18\x89\x01 \x01(\r\x12\x30\n\'store_forward_module_history_return_max\x18\x8a\x01 \x01(\r\x12\x33\n*store_forward_module_history_return_window\x18\x8b\x01 \x01(\r\x12\x39\n0telemetry_module_environment_measurement_enabled\x18\x8c\x01 \x01(\x08\x12\x34\n+telemetry_module_environment_screen_enabled\x18\x8d\x01 \x01(\x08\x12@\n7telemetry_module_environment_read_error_count_threshold\x18\x8e\x01 \x01(\r\x12\x30\n\'telemetry_module_device_update_interval\x18\x8f\x01 \x01(\r\x12\x37\n.telemetry_module_environment_recovery_interval\x18\x90\x01 \x01(\r\x12\x38\n/telemetry_module_environment_display_fahrenheit\x18\x91\x01 \x01(\x08\x12\x63\n(telemetry_module_environment_sensor_type\x18\x92\x01 \x01(\x0e\x32\x30.RadioConfig.UserPreferences.TelemetrySensorType\x12\x30\n\'telemetry_module_environment_sensor_pin\x18\x93\x01 \x01(\r\x12\x17\n\x0eposition_flags\x18\x96\x01 \x01(\r\x12\x1a\n\x11is_always_powered\x18\x97\x01 \x01(\x08\x12\"\n\x19\x61uto_screen_carousel_secs\x18\x98\x01 \x01(\r\x12\'\n\x1eon_battery_shutdown_after_secs\x18\x99\x01 \x01(\r\x12\x12\n\thop_limit\x18\x9a\x01 \x01(\r\x12\x16\n\rmqtt_username\x18\x9b\x01 \x01(\t\x12\x16\n\rmqtt_password\x18\x9c\x01 \x01(\t\x12\x1c\n\x13is_lora_tx_disabled\x18\x9d\x01 \x01(\x08\x12\x18\n\x0fis_power_saving\x18\x9e\x01 \x01(\x08\x12\x18\n\x0frotary1_enabled\x18\xa0\x01 \x01(\x08\x12\x1a\n\x11inputbroker_pin_a\x18\xa1\x01 \x01(\r\x12\x1a\n\x11inputbroker_pin_b\x18\xa2\x01 \x01(\r\x12\x1e\n\x15inputbroker_pin_press\x18\xa3\x01 \x01(\r\x12.\n\x14inputbroker_event_cw\x18\xa4\x01 \x01(\x0e\x32\x0f.InputEventChar\x12/\n\x15inputbroker_event_ccw\x18\xa5\x01 \x01(\x0e\x32\x0f.InputEventChar\x12\x31\n\x17inputbroker_event_press\x18\xa6\x01 \x01(\x0e\x32\x0f.InputEventChar\x12\x18\n\x0fupdown1_enabled\x18\xa7\x01 \x01(\x08\x12&\n\x1d\x63\x61nned_message_module_enabled\x18\xaa\x01 \x01(\x08\x12\x31\n(canned_message_module_allow_input_source\x18\xab\x01 \x01(\t\x12(\n\x1f\x63\x61nned_message_module_send_bell\x18\xad\x01 \x01(\x08\x12 \n\x17mqtt_encryption_enabled\x18\xae\x01 \x01(\x08\x12 \n\x17\x61\x64\x63_multiplier_override\x18\xaf\x01 \x01(\x02\x12\x35\n,telemetry_module_environment_update_interval\x18\xb1\x01 \x01(\r\"\xd1\x01\n\x0bSerial_Baud\x12\x10\n\x0c\x42\x41UD_Default\x10\x00\x12\r\n\tBAUD_2400\x10\x01\x12\r\n\tBAUD_4800\x10\x02\x12\r\n\tBAUD_9600\x10\x03\x12\x0e\n\nBAUD_19200\x10\x04\x12\x0e\n\nBAUD_38400\x10\x05\x12\x0e\n\nBAUD_57600\x10\x06\x12\x0f\n\x0b\x42\x41UD_115200\x10\x07\x12\x0f\n\x0b\x42\x41UD_230400\x10\x08\x12\x0f\n\x0b\x42\x41UD_460800\x10\t\x12\x0f\n\x0b\x42\x41UD_576000\x10\n\x12\x0f\n\x0b\x42\x41UD_921600\x10\x0b\"@\n\x0bSerial_Mode\x12\x10\n\x0cMODE_Default\x10\x00\x12\x0f\n\x0bMODE_SIMPLE\x10\x01\x12\x0e\n\nMODE_PROTO\x10\x02\"\x88\x01\n\x13TelemetrySensorType\x12\x08\n\x04None\x10\x00\x12\t\n\x05\x44HT11\x10\x01\x12\x0b\n\x07\x44S18B20\x10\x02\x12\t\n\x05\x44HT12\x10\x03\x12\t\n\x05\x44HT21\x10\x04\x12\t\n\x05\x44HT22\x10\x05\x12\n\n\x06\x42ME280\x10\x06\x12\n\n\x06\x42ME680\x10\x07\x12\x0b\n\x07MCP9808\x10\x08\x12\t\n\x05SHTC3\x10\tJ\x06\x08\x88\x01\x10\x89\x01*\x81\x01\n\nRegionCode\x12\t\n\x05Unset\x10\x00\x12\x06\n\x02US\x10\x01\x12\t\n\x05\x45U433\x10\x02\x12\t\n\x05\x45U868\x10\x03\x12\x06\n\x02\x43N\x10\x04\x12\x06\n\x02JP\x10\x05\x12\x07\n\x03\x41NZ\x10\x06\x12\x06\n\x02KR\x10\x07\x12\x06\n\x02TW\x10\x08\x12\x06\n\x02RU\x10\t\x12\x06\n\x02IN\x10\n\x12\t\n\x05NZ865\x10\x0b\x12\x06\n\x02TH\x10\x0c*@\n\x04Role\x12\n\n\x06\x43lient\x10\x00\x12\x0e\n\nClientMute\x10\x01\x12\n\n\x06Router\x10\x02\x12\x10\n\x0cRouterClient\x10\x03*\xd1\x01\n\rChargeCurrent\x12\x0b\n\x07MAUnset\x10\x00\x12\t\n\x05MA100\x10\x01\x12\t\n\x05MA190\x10\x02\x12\t\n\x05MA280\x10\x03\x12\t\n\x05MA360\x10\x04\x12\t\n\x05MA450\x10\x05\x12\t\n\x05MA550\x10\x06\x12\t\n\x05MA630\x10\x07\x12\t\n\x05MA700\x10\x08\x12\t\n\x05MA780\x10\t\x12\t\n\x05MA880\x10\n\x12\t\n\x05MA960\x10\x0b\x12\n\n\x06MA1000\x10\x0c\x12\n\n\x06MA1080\x10\r\x12\n\n\x06MA1160\x10\x0e\x12\n\n\x06MA1240\x10\x0f\x12\n\n\x06MA1320\x10\x10*\x83\x01\n\x13GpsCoordinateFormat\x12\x10\n\x0cGpsFormatDec\x10\x00\x12\x10\n\x0cGpsFormatDMS\x10\x01\x12\x10\n\x0cGpsFormatUTM\x10\x02\x12\x11\n\rGpsFormatMGRS\x10\x03\x12\x10\n\x0cGpsFormatOLC\x10\x04\x12\x11\n\rGpsFormatOSGR\x10\x05*\xbc\x01\n\rPositionFlags\x12\x11\n\rPOS_UNDEFINED\x10\x00\x12\x10\n\x0cPOS_ALTITUDE\x10\x01\x12\x0f\n\x0bPOS_ALT_MSL\x10\x02\x12\x0f\n\x0bPOS_GEO_SEP\x10\x04\x12\x0b\n\x07POS_DOP\x10\x08\x12\r\n\tPOS_HVDOP\x10\x10\x12\x0f\n\x0bPOS_BATTERY\x10 \x12\x11\n\rPOS_SATINVIEW\x10@\x12\x10\n\x0bPOS_SEQ_NOS\x10\x80\x01\x12\x12\n\rPOS_TIMESTAMP\x10\x80\x02*\x83\x01\n\x0eInputEventChar\x12\x0c\n\x08KEY_NONE\x10\x00\x12\n\n\x06KEY_UP\x10\x11\x12\x0c\n\x08KEY_DOWN\x10\x12\x12\x0c\n\x08KEY_LEFT\x10\x13\x12\r\n\tKEY_RIGHT\x10\x14\x12\x0e\n\nKEY_SELECT\x10\n\x12\x0c\n\x08KEY_BACK\x10\x1b\x12\x0e\n\nKEY_CANCEL\x10\x18\x42M\n\x13\x63om.geeksville.meshB\x11RadioConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' ) _REGIONCODE = _descriptor.EnumDescriptor( @@ -83,8 +83,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3569, - serialized_end=3698, + serialized_start=3540, + serialized_end=3669, ) _sym_db.RegisterEnumDescriptor(_REGIONCODE) @@ -114,8 +114,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3700, - serialized_end=3764, + serialized_start=3671, + serialized_end=3735, ) _sym_db.RegisterEnumDescriptor(_ROLE) @@ -197,8 +197,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3767, - serialized_end=3976, + serialized_start=3738, + serialized_end=3947, ) _sym_db.RegisterEnumDescriptor(_CHARGECURRENT) @@ -236,8 +236,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3979, - serialized_end=4110, + serialized_start=3950, + serialized_end=4081, ) _sym_db.RegisterEnumDescriptor(_GPSCOORDINATEFORMAT) @@ -291,8 +291,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=4113, - serialized_end=4301, + serialized_start=4084, + serialized_end=4272, ) _sym_db.RegisterEnumDescriptor(_POSITIONFLAGS) @@ -338,8 +338,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=4304, - serialized_end=4435, + serialized_start=4275, + serialized_end=4406, ) _sym_db.RegisterEnumDescriptor(_INPUTEVENTCHAR) @@ -461,8 +461,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3144, - serialized_end=3353, + serialized_start=3115, + serialized_end=3324, ) _sym_db.RegisterEnumDescriptor(_RADIOCONFIG_USERPREFERENCES_SERIAL_BAUD) @@ -487,8 +487,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3355, - serialized_end=3419, + serialized_start=3326, + serialized_end=3390, ) _sym_db.RegisterEnumDescriptor(_RADIOCONFIG_USERPREFERENCES_SERIAL_MODE) @@ -541,8 +541,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3422, - serialized_end=3558, + serialized_start=3393, + serialized_end=3529, ) _sym_db.RegisterEnumDescriptor(_RADIOCONFIG_USERPREFERENCES_TELEMETRYSENSORTYPE) @@ -569,581 +569,574 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='send_owner_interval', full_name='RadioConfig.UserPreferences.send_owner_interval', index=2, - 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='wait_bluetooth_secs', full_name='RadioConfig.UserPreferences.wait_bluetooth_secs', index=3, + name='wait_bluetooth_secs', full_name='RadioConfig.UserPreferences.wait_bluetooth_secs', index=2, 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='screen_on_secs', full_name='RadioConfig.UserPreferences.screen_on_secs', index=4, + name='screen_on_secs', full_name='RadioConfig.UserPreferences.screen_on_secs', index=3, 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='phone_timeout_secs', full_name='RadioConfig.UserPreferences.phone_timeout_secs', index=5, + name='phone_timeout_secs', full_name='RadioConfig.UserPreferences.phone_timeout_secs', index=4, 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='phone_sds_timeout_sec', full_name='RadioConfig.UserPreferences.phone_sds_timeout_sec', index=6, + name='phone_sds_timeout_sec', full_name='RadioConfig.UserPreferences.phone_sds_timeout_sec', index=5, number=7, 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='mesh_sds_timeout_secs', full_name='RadioConfig.UserPreferences.mesh_sds_timeout_secs', index=7, + name='mesh_sds_timeout_secs', full_name='RadioConfig.UserPreferences.mesh_sds_timeout_secs', index=6, 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='sds_secs', full_name='RadioConfig.UserPreferences.sds_secs', index=8, + name='sds_secs', full_name='RadioConfig.UserPreferences.sds_secs', index=7, 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, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='ls_secs', full_name='RadioConfig.UserPreferences.ls_secs', index=9, + name='ls_secs', full_name='RadioConfig.UserPreferences.ls_secs', index=8, number=10, 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='min_wake_secs', full_name='RadioConfig.UserPreferences.min_wake_secs', index=10, + name='min_wake_secs', full_name='RadioConfig.UserPreferences.min_wake_secs', index=9, number=11, 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='wifi_ssid', full_name='RadioConfig.UserPreferences.wifi_ssid', index=11, + name='wifi_ssid', full_name='RadioConfig.UserPreferences.wifi_ssid', index=10, number=12, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='wifi_password', full_name='RadioConfig.UserPreferences.wifi_password', index=12, + name='wifi_password', full_name='RadioConfig.UserPreferences.wifi_password', index=11, number=13, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='wifi_ap_mode', full_name='RadioConfig.UserPreferences.wifi_ap_mode', index=13, + name='wifi_ap_mode', full_name='RadioConfig.UserPreferences.wifi_ap_mode', index=12, number=14, 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='region', full_name='RadioConfig.UserPreferences.region', index=14, + name='region', full_name='RadioConfig.UserPreferences.region', index=13, number=15, 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='charge_current', full_name='RadioConfig.UserPreferences.charge_current', index=15, + name='charge_current', full_name='RadioConfig.UserPreferences.charge_current', index=14, number=16, 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='role', full_name='RadioConfig.UserPreferences.role', index=16, + name='role', full_name='RadioConfig.UserPreferences.role', index=15, number=18, 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='is_low_power', full_name='RadioConfig.UserPreferences.is_low_power', index=17, + name='is_low_power', full_name='RadioConfig.UserPreferences.is_low_power', index=16, number=38, 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='fixed_position', full_name='RadioConfig.UserPreferences.fixed_position', index=18, + name='fixed_position', full_name='RadioConfig.UserPreferences.fixed_position', index=17, number=39, 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='serial_disabled', full_name='RadioConfig.UserPreferences.serial_disabled', index=19, + name='serial_disabled', full_name='RadioConfig.UserPreferences.serial_disabled', index=18, number=40, 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='location_share_disabled', full_name='RadioConfig.UserPreferences.location_share_disabled', index=20, + name='location_share_disabled', full_name='RadioConfig.UserPreferences.location_share_disabled', index=19, number=32, 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='gps_disabled', full_name='RadioConfig.UserPreferences.gps_disabled', index=21, + name='gps_disabled', full_name='RadioConfig.UserPreferences.gps_disabled', index=20, number=33, 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='gps_update_interval', full_name='RadioConfig.UserPreferences.gps_update_interval', index=22, + name='gps_update_interval', full_name='RadioConfig.UserPreferences.gps_update_interval', index=21, number=34, 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='gps_attempt_time', full_name='RadioConfig.UserPreferences.gps_attempt_time', index=23, + name='gps_attempt_time', full_name='RadioConfig.UserPreferences.gps_attempt_time', index=22, number=36, 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='gps_accept_2d', full_name='RadioConfig.UserPreferences.gps_accept_2d', index=24, + name='gps_accept_2d', full_name='RadioConfig.UserPreferences.gps_accept_2d', index=23, number=45, 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='gps_max_dop', full_name='RadioConfig.UserPreferences.gps_max_dop', index=25, + name='gps_max_dop', full_name='RadioConfig.UserPreferences.gps_max_dop', index=24, number=46, 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='frequency_offset', full_name='RadioConfig.UserPreferences.frequency_offset', index=26, + name='frequency_offset', full_name='RadioConfig.UserPreferences.frequency_offset', index=25, number=41, type=2, cpp_type=6, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='mqtt_server', full_name='RadioConfig.UserPreferences.mqtt_server', index=27, + name='mqtt_server', full_name='RadioConfig.UserPreferences.mqtt_server', index=26, number=42, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='mqtt_disabled', full_name='RadioConfig.UserPreferences.mqtt_disabled', index=28, + name='mqtt_disabled', full_name='RadioConfig.UserPreferences.mqtt_disabled', index=27, number=43, 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='gps_format', full_name='RadioConfig.UserPreferences.gps_format', index=29, + name='gps_format', full_name='RadioConfig.UserPreferences.gps_format', index=28, number=44, 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='factory_reset', full_name='RadioConfig.UserPreferences.factory_reset', index=30, + name='factory_reset', full_name='RadioConfig.UserPreferences.factory_reset', index=29, number=100, 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='debug_log_enabled', full_name='RadioConfig.UserPreferences.debug_log_enabled', index=31, + name='debug_log_enabled', full_name='RadioConfig.UserPreferences.debug_log_enabled', index=30, number=101, 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='ignore_incoming', full_name='RadioConfig.UserPreferences.ignore_incoming', index=32, + name='ignore_incoming', full_name='RadioConfig.UserPreferences.ignore_incoming', index=31, number=103, type=13, cpp_type=3, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='serial_module_enabled', full_name='RadioConfig.UserPreferences.serial_module_enabled', index=33, + name='serial_module_enabled', full_name='RadioConfig.UserPreferences.serial_module_enabled', index=32, number=120, 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='serial_module_echo', full_name='RadioConfig.UserPreferences.serial_module_echo', index=34, + name='serial_module_echo', full_name='RadioConfig.UserPreferences.serial_module_echo', index=33, number=121, 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='serial_module_rxd', full_name='RadioConfig.UserPreferences.serial_module_rxd', index=35, + name='serial_module_rxd', full_name='RadioConfig.UserPreferences.serial_module_rxd', index=34, number=122, 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='serial_module_txd', full_name='RadioConfig.UserPreferences.serial_module_txd', index=36, + name='serial_module_txd', full_name='RadioConfig.UserPreferences.serial_module_txd', index=35, number=123, 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='serial_module_baud', full_name='RadioConfig.UserPreferences.serial_module_baud', index=37, + name='serial_module_baud', full_name='RadioConfig.UserPreferences.serial_module_baud', index=36, number=176, 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='serial_module_timeout', full_name='RadioConfig.UserPreferences.serial_module_timeout', index=38, + name='serial_module_timeout', full_name='RadioConfig.UserPreferences.serial_module_timeout', index=37, number=124, 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='serial_module_mode', full_name='RadioConfig.UserPreferences.serial_module_mode', index=39, + name='serial_module_mode', full_name='RadioConfig.UserPreferences.serial_module_mode', index=38, number=125, 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='ext_notification_module_enabled', full_name='RadioConfig.UserPreferences.ext_notification_module_enabled', index=40, + name='ext_notification_module_enabled', full_name='RadioConfig.UserPreferences.ext_notification_module_enabled', index=39, number=126, 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='ext_notification_module_output_ms', full_name='RadioConfig.UserPreferences.ext_notification_module_output_ms', index=41, + name='ext_notification_module_output_ms', full_name='RadioConfig.UserPreferences.ext_notification_module_output_ms', index=40, number=127, 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='ext_notification_module_output', full_name='RadioConfig.UserPreferences.ext_notification_module_output', index=42, + name='ext_notification_module_output', full_name='RadioConfig.UserPreferences.ext_notification_module_output', index=41, number=128, 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='ext_notification_module_active', full_name='RadioConfig.UserPreferences.ext_notification_module_active', index=43, + name='ext_notification_module_active', full_name='RadioConfig.UserPreferences.ext_notification_module_active', index=42, number=129, 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='ext_notification_module_alert_message', full_name='RadioConfig.UserPreferences.ext_notification_module_alert_message', index=44, + name='ext_notification_module_alert_message', full_name='RadioConfig.UserPreferences.ext_notification_module_alert_message', index=43, number=130, 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='ext_notification_module_alert_bell', full_name='RadioConfig.UserPreferences.ext_notification_module_alert_bell', index=45, + name='ext_notification_module_alert_bell', full_name='RadioConfig.UserPreferences.ext_notification_module_alert_bell', index=44, number=131, 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='range_test_module_enabled', full_name='RadioConfig.UserPreferences.range_test_module_enabled', index=46, + name='range_test_module_enabled', full_name='RadioConfig.UserPreferences.range_test_module_enabled', index=45, number=132, 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='range_test_module_sender', full_name='RadioConfig.UserPreferences.range_test_module_sender', index=47, + name='range_test_module_sender', full_name='RadioConfig.UserPreferences.range_test_module_sender', index=46, number=133, 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='range_test_module_save', full_name='RadioConfig.UserPreferences.range_test_module_save', index=48, + name='range_test_module_save', full_name='RadioConfig.UserPreferences.range_test_module_save', index=47, number=134, 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='store_forward_module_enabled', full_name='RadioConfig.UserPreferences.store_forward_module_enabled', index=49, + name='store_forward_module_enabled', full_name='RadioConfig.UserPreferences.store_forward_module_enabled', index=48, number=148, 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='store_forward_module_heartbeat', full_name='RadioConfig.UserPreferences.store_forward_module_heartbeat', index=50, + name='store_forward_module_heartbeat', full_name='RadioConfig.UserPreferences.store_forward_module_heartbeat', index=49, number=149, 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='store_forward_module_records', full_name='RadioConfig.UserPreferences.store_forward_module_records', index=51, + name='store_forward_module_records', full_name='RadioConfig.UserPreferences.store_forward_module_records', index=50, number=137, 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='store_forward_module_history_return_max', full_name='RadioConfig.UserPreferences.store_forward_module_history_return_max', index=52, + name='store_forward_module_history_return_max', full_name='RadioConfig.UserPreferences.store_forward_module_history_return_max', index=51, number=138, 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='store_forward_module_history_return_window', full_name='RadioConfig.UserPreferences.store_forward_module_history_return_window', index=53, + name='store_forward_module_history_return_window', full_name='RadioConfig.UserPreferences.store_forward_module_history_return_window', index=52, number=139, 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='telemetry_module_environment_measurement_enabled', full_name='RadioConfig.UserPreferences.telemetry_module_environment_measurement_enabled', index=54, + name='telemetry_module_environment_measurement_enabled', full_name='RadioConfig.UserPreferences.telemetry_module_environment_measurement_enabled', index=53, number=140, 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='telemetry_module_environment_screen_enabled', full_name='RadioConfig.UserPreferences.telemetry_module_environment_screen_enabled', index=55, + name='telemetry_module_environment_screen_enabled', full_name='RadioConfig.UserPreferences.telemetry_module_environment_screen_enabled', index=54, number=141, 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='telemetry_module_environment_read_error_count_threshold', full_name='RadioConfig.UserPreferences.telemetry_module_environment_read_error_count_threshold', index=56, + name='telemetry_module_environment_read_error_count_threshold', full_name='RadioConfig.UserPreferences.telemetry_module_environment_read_error_count_threshold', index=55, number=142, 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='telemetry_module_device_update_interval', full_name='RadioConfig.UserPreferences.telemetry_module_device_update_interval', index=57, + name='telemetry_module_device_update_interval', full_name='RadioConfig.UserPreferences.telemetry_module_device_update_interval', index=56, number=143, 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='telemetry_module_environment_recovery_interval', full_name='RadioConfig.UserPreferences.telemetry_module_environment_recovery_interval', index=58, + name='telemetry_module_environment_recovery_interval', full_name='RadioConfig.UserPreferences.telemetry_module_environment_recovery_interval', index=57, number=144, 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='telemetry_module_environment_display_fahrenheit', full_name='RadioConfig.UserPreferences.telemetry_module_environment_display_fahrenheit', index=59, + name='telemetry_module_environment_display_fahrenheit', full_name='RadioConfig.UserPreferences.telemetry_module_environment_display_fahrenheit', index=58, number=145, 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='telemetry_module_environment_sensor_type', full_name='RadioConfig.UserPreferences.telemetry_module_environment_sensor_type', index=60, + name='telemetry_module_environment_sensor_type', full_name='RadioConfig.UserPreferences.telemetry_module_environment_sensor_type', index=59, number=146, 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='telemetry_module_environment_sensor_pin', full_name='RadioConfig.UserPreferences.telemetry_module_environment_sensor_pin', index=61, + name='telemetry_module_environment_sensor_pin', full_name='RadioConfig.UserPreferences.telemetry_module_environment_sensor_pin', index=60, number=147, 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='position_flags', full_name='RadioConfig.UserPreferences.position_flags', index=62, + name='position_flags', full_name='RadioConfig.UserPreferences.position_flags', index=61, number=150, 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='is_always_powered', full_name='RadioConfig.UserPreferences.is_always_powered', index=63, + name='is_always_powered', full_name='RadioConfig.UserPreferences.is_always_powered', index=62, number=151, 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='auto_screen_carousel_secs', full_name='RadioConfig.UserPreferences.auto_screen_carousel_secs', index=64, + name='auto_screen_carousel_secs', full_name='RadioConfig.UserPreferences.auto_screen_carousel_secs', index=63, number=152, 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='on_battery_shutdown_after_secs', full_name='RadioConfig.UserPreferences.on_battery_shutdown_after_secs', index=65, + name='on_battery_shutdown_after_secs', full_name='RadioConfig.UserPreferences.on_battery_shutdown_after_secs', index=64, number=153, 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='hop_limit', full_name='RadioConfig.UserPreferences.hop_limit', index=66, + name='hop_limit', full_name='RadioConfig.UserPreferences.hop_limit', index=65, number=154, 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='mqtt_username', full_name='RadioConfig.UserPreferences.mqtt_username', index=67, + name='mqtt_username', full_name='RadioConfig.UserPreferences.mqtt_username', index=66, number=155, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='mqtt_password', full_name='RadioConfig.UserPreferences.mqtt_password', index=68, + name='mqtt_password', full_name='RadioConfig.UserPreferences.mqtt_password', index=67, number=156, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='is_lora_tx_disabled', full_name='RadioConfig.UserPreferences.is_lora_tx_disabled', index=69, + name='is_lora_tx_disabled', full_name='RadioConfig.UserPreferences.is_lora_tx_disabled', index=68, number=157, 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='is_power_saving', full_name='RadioConfig.UserPreferences.is_power_saving', index=70, + name='is_power_saving', full_name='RadioConfig.UserPreferences.is_power_saving', index=69, number=158, 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='rotary1_enabled', full_name='RadioConfig.UserPreferences.rotary1_enabled', index=71, + name='rotary1_enabled', full_name='RadioConfig.UserPreferences.rotary1_enabled', index=70, number=160, 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='inputbroker_pin_a', full_name='RadioConfig.UserPreferences.inputbroker_pin_a', index=72, + name='inputbroker_pin_a', full_name='RadioConfig.UserPreferences.inputbroker_pin_a', index=71, number=161, 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='inputbroker_pin_b', full_name='RadioConfig.UserPreferences.inputbroker_pin_b', index=73, + name='inputbroker_pin_b', full_name='RadioConfig.UserPreferences.inputbroker_pin_b', index=72, number=162, 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='inputbroker_pin_press', full_name='RadioConfig.UserPreferences.inputbroker_pin_press', index=74, + name='inputbroker_pin_press', full_name='RadioConfig.UserPreferences.inputbroker_pin_press', index=73, number=163, 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='inputbroker_event_cw', full_name='RadioConfig.UserPreferences.inputbroker_event_cw', index=75, + name='inputbroker_event_cw', full_name='RadioConfig.UserPreferences.inputbroker_event_cw', index=74, number=164, 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='inputbroker_event_ccw', full_name='RadioConfig.UserPreferences.inputbroker_event_ccw', index=76, + name='inputbroker_event_ccw', full_name='RadioConfig.UserPreferences.inputbroker_event_ccw', index=75, number=165, 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='inputbroker_event_press', full_name='RadioConfig.UserPreferences.inputbroker_event_press', index=77, + name='inputbroker_event_press', full_name='RadioConfig.UserPreferences.inputbroker_event_press', index=76, number=166, 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='updown1_enabled', full_name='RadioConfig.UserPreferences.updown1_enabled', index=78, + name='updown1_enabled', full_name='RadioConfig.UserPreferences.updown1_enabled', index=77, number=167, 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='canned_message_module_enabled', full_name='RadioConfig.UserPreferences.canned_message_module_enabled', index=79, + name='canned_message_module_enabled', full_name='RadioConfig.UserPreferences.canned_message_module_enabled', index=78, number=170, 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='canned_message_module_allow_input_source', full_name='RadioConfig.UserPreferences.canned_message_module_allow_input_source', index=80, + name='canned_message_module_allow_input_source', full_name='RadioConfig.UserPreferences.canned_message_module_allow_input_source', index=79, number=171, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='canned_message_module_send_bell', full_name='RadioConfig.UserPreferences.canned_message_module_send_bell', index=81, + name='canned_message_module_send_bell', full_name='RadioConfig.UserPreferences.canned_message_module_send_bell', index=80, number=173, 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='mqtt_encryption_enabled', full_name='RadioConfig.UserPreferences.mqtt_encryption_enabled', index=82, + name='mqtt_encryption_enabled', full_name='RadioConfig.UserPreferences.mqtt_encryption_enabled', index=81, number=174, 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='adc_multiplier_override', full_name='RadioConfig.UserPreferences.adc_multiplier_override', index=83, + name='adc_multiplier_override', full_name='RadioConfig.UserPreferences.adc_multiplier_override', index=82, number=175, type=2, cpp_type=6, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='telemetry_module_environment_update_interval', full_name='RadioConfig.UserPreferences.telemetry_module_environment_update_interval', index=84, + name='telemetry_module_environment_update_interval', full_name='RadioConfig.UserPreferences.telemetry_module_environment_update_interval', index=83, number=177, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -1165,7 +1158,7 @@ oneofs=[ ], serialized_start=89, - serialized_end=3566, + serialized_end=3537, ) _RADIOCONFIG = _descriptor.Descriptor( @@ -1195,7 +1188,7 @@ oneofs=[ ], serialized_start=22, - serialized_end=3566, + serialized_end=3537, ) _RADIOCONFIG_USERPREFERENCES.fields_by_name['region'].enum_type = _REGIONCODE From 804c09b6c57c98de60e9476d0511529ef84f60f9 Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Mon, 11 Apr 2022 14:18:38 -0700 Subject: [PATCH 4/5] bump to v2 of codecov --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8a3ee9d..8253e941 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: run: | pytest --cov=meshtastic --cov-report=xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v2 with: token: ${{ secrets.CODECOV_TOKEN }} file: ./coverage.xml From bd4d309d89cf6576b9b1ea3228d399ec7ba276cb Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Mon, 11 Apr 2022 14:23:49 -0700 Subject: [PATCH 5/5] update codecov --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8253e941..608cae12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,11 +45,11 @@ jobs: uses: codecov/codecov-action@v2 with: token: ${{ secrets.CODECOV_TOKEN }} - file: ./coverage.xml + files: ./coverage.xml flags: unittests name: codecov-umbrella - yml: ./codecov.yml fail_ci_if_error: true + verbose: true validate: runs-on: ubuntu-latest strategy: