From 63ceb7194e737eeba949e096a7f4c04eb01ec408 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 5 Oct 2022 21:21:23 -0500 Subject: [PATCH 1/6] Denoms noms noms --- config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.proto b/config.proto index 223b2c9..aec0e96 100644 --- a/config.proto +++ b/config.proto @@ -536,7 +536,7 @@ message Config { /* * The denominator of the coding rate. - * ie for 4/8, the value is 8. 5/8 the value is 5. + * ie for 4/5, the value is 5. 4/8 the value is 8. */ uint32 coding_rate = 5; From a4f10fa0e4ea457dc3259e9b588543dde568de5f Mon Sep 17 00:00:00 2001 From: lewishe Date: Fri, 7 Oct 2022 17:38:37 +0800 Subject: [PATCH 2/6] Add 3-axis magnetic force and 6-axis inertial sensor enum --- telemetry.proto | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/telemetry.proto b/telemetry.proto index 0842467..5492b21 100644 --- a/telemetry.proto +++ b/telemetry.proto @@ -140,4 +140,15 @@ enum TelemetrySensorType { * High accuracy pressure */ LPS22 = 8; + + /* + * 3-Axis magnetic sensor + */ + QMC6310 = 9; + + /* + * 6-Axis inertial measurement sensor + */ + QMI8658 = 10; + }; From 984cd89e8dad056c376f214a004e213f7717cca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Fri, 7 Oct 2022 22:10:51 +0200 Subject: [PATCH 3/6] Update admin.proto --- admin.proto | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/admin.proto b/admin.proto index 87cf0e6..e2e6ebf 100644 --- a/admin.proto +++ b/admin.proto @@ -224,6 +224,12 @@ message AdminMessage { */ bool confirm_set_radio = 67; + /* + * Tell the node to reboot into the OTA Firmware in this many seconds (or <0 to cancel reboot) + * Only Implemented for ESP32 Devices. This needs to be issued to send a new main firmware via bluetooth. + */ + int32 reboot_ota_seconds = 95; + /* * This message is only supported for the simulator porduino build. * If received the simulator will exit successfully. From 408f8c4385f604ece74a9208e966076f34d682c6 Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Sun, 9 Oct 2022 16:56:01 +1030 Subject: [PATCH 4/6] Change to a boolean --- admin.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin.proto b/admin.proto index e2e6ebf..b8a2470 100644 --- a/admin.proto +++ b/admin.proto @@ -165,7 +165,7 @@ message AdminMessage { /* * Request the node to send device metadata (firmware, protobuf version, etc) */ - uint32 get_device_metadata_request = 12; + bool get_device_metadata_request = 12; /* * Device metadata response From 01dc773edd1a060f9c78cd650a010f24c88ab9da Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Sun, 9 Oct 2022 22:48:28 +1000 Subject: [PATCH 5/6] Yank (#209) --- admin.proto | 5 ----- 1 file changed, 5 deletions(-) diff --git a/admin.proto b/admin.proto index b8a2470..2da1832 100644 --- a/admin.proto +++ b/admin.proto @@ -147,11 +147,6 @@ message AdminMessage { */ ModuleConfig get_module_config_response = 8; - /* - * Send all channels in the response to this message - */ - bool get_all_channel_request = 9; - /* * Get the Canned Message Module messages in the response to this message. */ From d3dfaa63a5108c1da7571cd780efaf561b99cc74 Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Sun, 9 Oct 2022 23:14:00 +1000 Subject: [PATCH 6/6] Add channel to from radio (#210) * Yank * Add to * fix import sort --- mesh.proto | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mesh.proto b/mesh.proto index 23a5879..603b6c2 100644 --- a/mesh.proto +++ b/mesh.proto @@ -4,6 +4,7 @@ option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; option go_package = "github.com/meshtastic/gomeshproto"; +import "channel.proto"; import "config.proto"; import "module_config.proto"; import "portnums.proto"; @@ -1227,11 +1228,15 @@ message FromRadio { */ bool rebooted = 8; - /* * Include module config */ ModuleConfig moduleConfig = 9; + + /* + * One packet is sent for each channel + */ + Channel channel = 10; } }