From 69d6f063b9bed2c37fdfacfd779448da76226eaf Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Wed, 30 Mar 2022 14:14:14 +1100 Subject: [PATCH 1/9] Missed one. --- radioconfig.proto | 1 - 1 file changed, 1 deletion(-) diff --git a/radioconfig.proto b/radioconfig.proto index ce2bbd3..f9e432a 100644 --- a/radioconfig.proto +++ b/radioconfig.proto @@ -932,7 +932,6 @@ message RadioConfig { * Whether to send encrypted or decrypted packets to MQTT. * This parameter is only honoured if you also set mqtt_server * (the default official mqtt.meshtastic.org server can handle encrypted packets) - * * Decrypted packets may be useful for external systems that want to consume meshtastic packets */ bool mqtt_encryption_enabled = 174; From ca8ea6be655f37e2e6c40016e595b6f2986f2f31 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Fri, 1 Apr 2022 18:13:30 -0500 Subject: [PATCH 2/9] Promote device metrics --- mesh.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesh.proto b/mesh.proto index 211bb2c..af9393f 100644 --- a/mesh.proto +++ b/mesh.proto @@ -1009,9 +1009,9 @@ message NodeInfo { */ fixed32 last_heard = 5; /* - * The latest device telemetry data for the node. + * The latest device metrics for the node. */ - Telemetry telemetry = 6; + DeviceMetrics device_metrics = 6; } /* From e03371393bb9eb8947fbcfaef5f2b00e87e199cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Sat, 2 Apr 2022 22:40:21 +0200 Subject: [PATCH 3/9] Add NANO_G1 to Protocol Buffers Complements https://github.com/meshtastic/Meshtastic-device/pull/1351 --- mesh.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mesh.proto b/mesh.proto index af9393f..d218cb4 100644 --- a/mesh.proto +++ b/mesh.proto @@ -333,6 +333,11 @@ enum HardwareModel { */ RAK11200 = 40; + /* + * B&Q Consulting Nano Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:nano + */ + NANO_G1 = 41, + /* * Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. */ From c7649e9611087c9ae975d3723efd33167f7fd21f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Sat, 2 Apr 2022 22:48:54 +0200 Subject: [PATCH 4/9] ProtoLint caught sloppy me out --- mesh.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesh.proto b/mesh.proto index d218cb4..2931e48 100644 --- a/mesh.proto +++ b/mesh.proto @@ -336,7 +336,7 @@ enum HardwareModel { /* * B&Q Consulting Nano Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:nano */ - NANO_G1 = 41, + NANO_G1 = 41; /* * Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. From c05eb2171a0f91e896aa2e7b42f247b0aae825f4 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Tue, 5 Apr 2022 15:22:34 +0200 Subject: [PATCH 5/9] Update mesh.proto --- mesh.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mesh.proto b/mesh.proto index 2931e48..81a456c 100644 --- a/mesh.proto +++ b/mesh.proto @@ -338,6 +338,11 @@ enum HardwareModel { */ NANO_G1 = 41; + /* + * nRF52840 Dongle : https://www.nordicsemi.com/Products/Development-hardware/nrf52840-dongle/ + */ + NRF52840_PCA10059 = 42; + /* * Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. */ From afea69344f1254215a63034c4f6cdbb5ab27f954 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Tue, 5 Apr 2022 17:33:24 +0200 Subject: [PATCH 6/9] Update mesh.proto --- mesh.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesh.proto b/mesh.proto index 81a456c..bcc0c92 100644 --- a/mesh.proto +++ b/mesh.proto @@ -338,7 +338,7 @@ enum HardwareModel { */ NANO_G1 = 41; - /* + /* * nRF52840 Dongle : https://www.nordicsemi.com/Products/Development-hardware/nrf52840-dongle/ */ NRF52840_PCA10059 = 42; From 72b3583ad97bea49432fdcfd368b15368ee25402 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 6 Apr 2022 07:27:42 -0500 Subject: [PATCH 7/9] Removed pref --- radioconfig.proto | 5 ----- 1 file changed, 5 deletions(-) diff --git a/radioconfig.proto b/radioconfig.proto index 6fe587c..85f9d8b 100644 --- a/radioconfig.proto +++ b/radioconfig.proto @@ -384,11 +384,6 @@ message RadioConfig { */ bool position_broadcast_smart_disabled = 17; - /* - * Send our owner info at least this often (also we always send once at boot - to rejoin the mesh) - */ - uint32 send_owner_interval = 2; - /* * If we miss this many owner messages from a node, we declare the node * offline (defaults to 3 - to allow for some lost packets) (FIXME not yet used) From 7c1b6cb6ad143b29c1031e307ed7d1dbe1280e92 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Wed, 6 Apr 2022 17:30:07 -0700 Subject: [PATCH 8/9] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a291992..9ff7954 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Meshtastic-protobufs [![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/meshtastic/Meshtastic-protobufs) [![CI](https://github.com/meshtastic/Meshtastic-protobufs/actions/workflows/ci.yml/badge.svg)](https://github.com/meshtastic/Meshtastic-protobufs/actions/workflows/ci.yml) +[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/Meshtastic-protobufs)](https://cla-assistant.io/meshtastic/Meshtastic-protobufs) The protobuf definitions for the Meshtastic project (used by apps and the device code) From 5a9da0b8572f22016524b0d658fe578199822e08 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Tue, 12 Apr 2022 07:44:54 -0500 Subject: [PATCH 9/9] Removed phone-sds-timeout --- radioconfig.proto | 7 ------- 1 file changed, 7 deletions(-) diff --git a/radioconfig.proto b/radioconfig.proto index 85f9d8b..389f246 100644 --- a/radioconfig.proto +++ b/radioconfig.proto @@ -413,13 +413,6 @@ message RadioConfig { */ uint32 phone_timeout_secs = 6; - /* - * Power management state machine option. - * See [power management](/docs/software/other/power) for details. - * 0 for default of two hours, MAXUINT for disabled - */ - uint32 phone_sds_timeout_sec = 7; - /* * Power management state machine option. * See [power management](/docs/software/other/power) for details.