From b18e2fb04d94a8c9d4a9fd4c54c75baad8fa1e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Thu, 3 Nov 2022 22:18:17 +0100 Subject: [PATCH 1/8] auto-detect override settings --- config.proto | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/config.proto b/config.proto index 631f6d8..04dbefe 100644 --- a/config.proto +++ b/config.proto @@ -399,6 +399,27 @@ message Config { */ IMPERIAL = 1; } + + /* + * Override OLED outo detect with this if it fails. + */ + enum OledType { + + /* + * Default / Auto + */ + OLED_AUTO = 0; + + /* + * Default / Auto + */ + OLED_SSD1306 = 1; + + /* + * Default / Auto + */ + OLED_SH1106 = 2; + } /* * Number of seconds the screen stays on after pressing the user button or receiving a message @@ -432,6 +453,11 @@ message Config { * Perferred display units */ DisplayUnits units = 6; + + /* + * Override auto-detect in screen + */ + OledType oled = 7; } /* From 0c10c957215d544b5dfc05224f56c47407531d76 Mon Sep 17 00:00:00 2001 From: sigmahour <> Date: Fri, 4 Nov 2022 22:25:38 -0400 Subject: [PATCH 2/8] updated links --- mesh.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesh.proto b/mesh.proto index 1cf2b40..1dbf7fe 100644 --- a/mesh.proto +++ b/mesh.proto @@ -720,7 +720,7 @@ message MeshPacket { /* * The sending node number. * Note: Our crypto implementation uses this field as well. - * See [crypto](/docs/developers/firmware/encryption) for details. + * See [crypto](/docs/about/overview/encryption) for details. * FIXME - really should be fixed32 instead, this encoding only hurts the ble link though. */ fixed32 from = 1; @@ -772,7 +772,7 @@ message MeshPacket { * needs to be unique for a few minutes (long enough to last for the length of * any ACK or the completion of a mesh broadcast flood). * Note: Our crypto implementation uses this id as well. - * See [crypto](/docs/developers/firmware/encryption) for details. + * See [crypto](/docs/about/overview/encryption) for details. * FIXME - really should be fixed32 instead, this encoding only * hurts the ble link though. */ From 5b892e4c196f8620f2009cdef219eb2c237cc636 Mon Sep 17 00:00:00 2001 From: sigmahour <111950404+sigmahour@users.noreply.github.com> Date: Thu, 10 Nov 2022 02:05:01 -0500 Subject: [PATCH 3/8] link change to encryption docs (#236) Co-authored-by: sigmahour <> --- mesh.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesh.proto b/mesh.proto index 1dbf7fe..77867d3 100644 --- a/mesh.proto +++ b/mesh.proto @@ -720,7 +720,7 @@ message MeshPacket { /* * The sending node number. * Note: Our crypto implementation uses this field as well. - * See [crypto](/docs/about/overview/encryption) for details. + * See [crypto](/docs/overview/encryption) for details. * FIXME - really should be fixed32 instead, this encoding only hurts the ble link though. */ fixed32 from = 1; @@ -772,7 +772,7 @@ message MeshPacket { * needs to be unique for a few minutes (long enough to last for the length of * any ACK or the completion of a mesh broadcast flood). * Note: Our crypto implementation uses this id as well. - * See [crypto](/docs/about/overview/encryption) for details. + * See [crypto](/docs/overview/encryption) for details. * FIXME - really should be fixed32 instead, this encoding only * hurts the ble link though. */ From 69cb9b344fe46b9679724639bf9acda69c622395 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 13 Nov 2022 07:41:37 -0600 Subject: [PATCH 4/8] Add heltec v3 (#237) --- mesh.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mesh.proto b/mesh.proto index 77867d3..37fcdbc 100644 --- a/mesh.proto +++ b/mesh.proto @@ -354,6 +354,11 @@ enum HardwareModel { * M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, Paper) https://m5stack.com/ */ M5STACK = 42; + + /* + * New Heltec LoRA32 with ESP32-S3 CPU + */ + HELTEC_V3 = 43; /* * 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 be94310be7544645339c40f8d18a8d2b5590113b Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 13 Nov 2022 08:32:07 -0600 Subject: [PATCH 5/8] Heltec Wireless Stick Lite with ESP32-S3 CPU --- mesh.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mesh.proto b/mesh.proto index 37fcdbc..b0b0be6 100644 --- a/mesh.proto +++ b/mesh.proto @@ -359,6 +359,11 @@ enum HardwareModel { * New Heltec LoRA32 with ESP32-S3 CPU */ HELTEC_V3 = 43; + + /* + * New Heltec Wireless Stick Lite with ESP32-S3 CPU + */ + HELTEC_WSL_V3 = 44; /* * 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 2563c546cbe50a1538c11a9e879335ddf409e45c Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 13 Nov 2022 08:35:16 -0600 Subject: [PATCH 6/8] Indent --- mesh.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesh.proto b/mesh.proto index b0b0be6..76d4e3f 100644 --- a/mesh.proto +++ b/mesh.proto @@ -363,7 +363,7 @@ enum HardwareModel { /* * New Heltec Wireless Stick Lite with ESP32-S3 CPU */ - HELTEC_WSL_V3 = 44; + HELTEC_WSL_V3 = 44; /* * 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 6758bcc00513ba63d3f3e77e56ea67167bb6853a Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 20 Nov 2022 15:48:40 -0600 Subject: [PATCH 7/8] Create transactional edit admin messages --- admin.proto | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/admin.proto b/admin.proto index 1c8dac6..14620d1 100644 --- a/admin.proto +++ b/admin.proto @@ -200,16 +200,17 @@ message AdminMessage { * Set the Canned Message Module messages text. */ string set_canned_message_module_messages = 36; + + /* + * Begins an edit transaction for config, module config, owner, and channel settings changes + * This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings) + */ + bool begin_edit_settings = 65; /* - * Sent immediatly after a config change has been sent to ensure comms, if this is not recieved, the config will be reverted after 10 mins + * Commits an open transaction for any edits made to config, module config, owner, and channel settings */ - bool confirm_set_config = 64; - - /* - * Sent immediatly after a config change has been sent to ensure comms, if this is not recieved, the config will be reverted after 10 mins - */ - bool confirm_set_module_config = 65; + bool commit_edit_settings = 64; /* * Setting channels/radio config remotely carries the risk that you might send an invalid config and the radio never talks to your mesh again. From 2ba3d3f6cbbe6df2c14c0b7767235902924d50f0 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 20 Nov 2022 16:13:38 -0600 Subject: [PATCH 8/8] Reindexed --- admin.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin.proto b/admin.proto index 14620d1..7d2713f 100644 --- a/admin.proto +++ b/admin.proto @@ -205,12 +205,12 @@ message AdminMessage { * Begins an edit transaction for config, module config, owner, and channel settings changes * This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings) */ - bool begin_edit_settings = 65; + bool begin_edit_settings = 64; /* * Commits an open transaction for any edits made to config, module config, owner, and channel settings */ - bool commit_edit_settings = 64; + bool commit_edit_settings = 65; /* * Setting channels/radio config remotely carries the risk that you might send an invalid config and the radio never talks to your mesh again.