From 550702a695bc31651c758757ccf70f0fbe9cc43c Mon Sep 17 00:00:00 2001 From: ford-jones Date: Thu, 11 Sep 2025 14:17:24 +1200 Subject: [PATCH 01/12] Added mute state to channel settings --- meshtastic/channel.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meshtastic/channel.proto b/meshtastic/channel.proto index 16c8c19..b59591e 100644 --- a/meshtastic/channel.proto +++ b/meshtastic/channel.proto @@ -86,6 +86,11 @@ message ChannelSettings { * Per-channel module settings. */ ModuleSettings module_settings = 7; + + /* + * Whether or not we should receive notifactions / alerts from this channel + */ + bool mute = 8; } /* From 638917dea8bb36b2823261c9fbc87430c859b3c3 Mon Sep 17 00:00:00 2001 From: ford-jones Date: Thu, 11 Sep 2025 17:31:36 +1200 Subject: [PATCH 02/12] Added mute state to nodedb entries --- meshtastic/admin.proto | 10 ++++++++++ meshtastic/deviceonly.proto | 10 ++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index 0259c2a..2f805ca 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -414,6 +414,16 @@ message AdminMessage { */ uint32 remove_ignored_node = 48; + /* + * Set specified node-num to be muted + */ + uint32 set_muted_node = 49; + + /* + * Set specified node-num to be heard / not-muted + */ + uint32 remove_muted_node = 50; + /* * 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) diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto index d449373..7465399 100644 --- a/meshtastic/deviceonly.proto +++ b/meshtastic/deviceonly.proto @@ -159,16 +159,22 @@ message NodeInfoLite { */ bool is_ignored = 11; + /* + * True if node has been muted + * Persists between NodeDB internal clean ups + */ + bool is_muted = 12; + /* * Last byte of the node number of the node that should be used as the next hop to reach this node. */ - uint32 next_hop = 12; + uint32 next_hop = 13; /* * Bitfield for storing booleans. * LSB 0 is_key_manually_verified */ - uint32 bitfield = 13; + uint32 bitfield = 14; } /* From b7e0ef2ec7510d11fce39ffc2e420f3739014f0e Mon Sep 17 00:00:00 2001 From: ford-jones Date: Thu, 11 Sep 2025 20:11:16 +1200 Subject: [PATCH 03/12] Added mute state to channel settings --- meshtastic/channel.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meshtastic/channel.proto b/meshtastic/channel.proto index 16c8c19..b59591e 100644 --- a/meshtastic/channel.proto +++ b/meshtastic/channel.proto @@ -86,6 +86,11 @@ message ChannelSettings { * Per-channel module settings. */ ModuleSettings module_settings = 7; + + /* + * Whether or not we should receive notifactions / alerts from this channel + */ + bool mute = 8; } /* From 6fa4def9710522ecacb68531597ed6e464fe0e19 Mon Sep 17 00:00:00 2001 From: ford-jones Date: Thu, 11 Sep 2025 20:16:08 +1200 Subject: [PATCH 04/12] Added muted state to node info --- meshtastic/admin.proto | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index 0259c2a..2f805ca 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -414,6 +414,16 @@ message AdminMessage { */ uint32 remove_ignored_node = 48; + /* + * Set specified node-num to be muted + */ + uint32 set_muted_node = 49; + + /* + * Set specified node-num to be heard / not-muted + */ + uint32 remove_muted_node = 50; + /* * 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) From e5abb26b83cf2eccc538a55f3532672e14d823f9 Mon Sep 17 00:00:00 2001 From: ford-jones Date: Sat, 13 Sep 2025 13:30:54 +1200 Subject: [PATCH 05/12] Make use of pre-existing channel_settings.module_settings.is_client_muted setting --- meshtastic/channel.proto | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meshtastic/channel.proto b/meshtastic/channel.proto index b59591e..16c8c19 100644 --- a/meshtastic/channel.proto +++ b/meshtastic/channel.proto @@ -86,11 +86,6 @@ message ChannelSettings { * Per-channel module settings. */ ModuleSettings module_settings = 7; - - /* - * Whether or not we should receive notifactions / alerts from this channel - */ - bool mute = 8; } /* From 080fd3b0d174af36271545415687aeafd1b4131d Mon Sep 17 00:00:00 2001 From: ford-jones Date: Sat, 13 Sep 2025 17:44:41 +1200 Subject: [PATCH 06/12] Revert previous commit - this needs it's own proto --- meshtastic/channel.proto | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meshtastic/channel.proto b/meshtastic/channel.proto index 16c8c19..0c9ff13 100644 --- a/meshtastic/channel.proto +++ b/meshtastic/channel.proto @@ -86,6 +86,13 @@ message ChannelSettings { * Per-channel module settings. */ ModuleSettings module_settings = 7; + + /* + * Whether or not we should receive notifactions / alerts through this channel + * Note: This is NOT the same as module_settings.is_client_mute which pertains + * to the device role. + */ + bool mute = 8; } /* From e8d10fe47874e248e7897eb8e3562f296606ac7a Mon Sep 17 00:00:00 2001 From: ford-jones Date: Sat, 13 Sep 2025 17:48:58 +1200 Subject: [PATCH 07/12] Remove trailing whitespace --- meshtastic/channel.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/channel.proto b/meshtastic/channel.proto index 0c9ff13..8605d63 100644 --- a/meshtastic/channel.proto +++ b/meshtastic/channel.proto @@ -89,7 +89,7 @@ message ChannelSettings { /* * Whether or not we should receive notifactions / alerts through this channel - * Note: This is NOT the same as module_settings.is_client_mute which pertains + * Note: This is NOT the same as module_settings.is_client_mute which pertains * to the device role. */ bool mute = 8; From 314f80bc6f1bb951f37533a0cd60d9ad4356376f Mon Sep 17 00:00:00 2001 From: ford-jones Date: Sun, 14 Sep 2025 17:41:11 +1200 Subject: [PATCH 08/12] Update comment --- meshtastic/channel.proto | 2 -- 1 file changed, 2 deletions(-) diff --git a/meshtastic/channel.proto b/meshtastic/channel.proto index 8605d63..4b77242 100644 --- a/meshtastic/channel.proto +++ b/meshtastic/channel.proto @@ -89,8 +89,6 @@ message ChannelSettings { /* * Whether or not we should receive notifactions / alerts through this channel - * Note: This is NOT the same as module_settings.is_client_mute which pertains - * to the device role. */ bool mute = 8; } From 9b3643e4aa0da1bb50c532850b9b614da7f9d51a Mon Sep 17 00:00:00 2001 From: ford-jones Date: Tue, 23 Sep 2025 11:46:10 +1200 Subject: [PATCH 09/12] Decouple node-mute from channel-mute --- meshtastic/admin.proto | 10 ---------- meshtastic/deviceonly.proto | 6 ------ 2 files changed, 16 deletions(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index 2f805ca..0259c2a 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -414,16 +414,6 @@ message AdminMessage { */ uint32 remove_ignored_node = 48; - /* - * Set specified node-num to be muted - */ - uint32 set_muted_node = 49; - - /* - * Set specified node-num to be heard / not-muted - */ - uint32 remove_muted_node = 50; - /* * 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) diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto index 7465399..ab439e3 100644 --- a/meshtastic/deviceonly.proto +++ b/meshtastic/deviceonly.proto @@ -159,12 +159,6 @@ message NodeInfoLite { */ bool is_ignored = 11; - /* - * True if node has been muted - * Persists between NodeDB internal clean ups - */ - bool is_muted = 12; - /* * Last byte of the node number of the node that should be used as the next hop to reach this node. */ From 38f77b20f8d64d4f4a66267ecb705a92d22b0aa1 Mon Sep 17 00:00:00 2001 From: ford-jones Date: Tue, 23 Sep 2025 12:11:32 +1200 Subject: [PATCH 10/12] Fix formatting --- meshtastic/deviceonly.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto index ab439e3..d449373 100644 --- a/meshtastic/deviceonly.proto +++ b/meshtastic/deviceonly.proto @@ -162,13 +162,13 @@ message NodeInfoLite { /* * Last byte of the node number of the node that should be used as the next hop to reach this node. */ - uint32 next_hop = 13; + uint32 next_hop = 12; /* * Bitfield for storing booleans. * LSB 0 is_key_manually_verified */ - uint32 bitfield = 14; + uint32 bitfield = 13; } /* From 08bd3380e7870837224ead1f2196c4bb194fd78b Mon Sep 17 00:00:00 2001 From: ford-jones Date: Tue, 23 Sep 2025 14:58:37 +1200 Subject: [PATCH 11/12] run buf format --- meshtastic/mesh.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index 504b7a5..fb1bc46 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -779,7 +779,7 @@ enum HardwareModel { * https://heltec.org/project/meshsolar/ */ HELTEC_MESH_SOLAR = 108; - + /* * Lilygo T-Echo Lite */ From 91909ce946a3a93924bce922c1a0e2d523ca9b2b Mon Sep 17 00:00:00 2001 From: ford-jones Date: Tue, 23 Sep 2025 14:59:32 +1200 Subject: [PATCH 12/12] run buf format --- meshtastic/config.proto | 2 +- meshtastic/device_ui.proto | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meshtastic/config.proto b/meshtastic/config.proto index ca6a353..56093d7 100644 --- a/meshtastic/config.proto +++ b/meshtastic/config.proto @@ -603,7 +603,7 @@ message Config { enum DeprecatedGpsCoordinateFormat { UNUSED = 0; } - + /* * Unit display preference */ diff --git a/meshtastic/device_ui.proto b/meshtastic/device_ui.proto index 003a1f4..716db89 100644 --- a/meshtastic/device_ui.proto +++ b/meshtastic/device_ui.proto @@ -88,13 +88,13 @@ message DeviceUIConfig { * true for analog clockface, false for digital clockface */ bool is_clockface_analog = 18; - + /* * How the GPS coordinates are formatted on the OLED screen. */ GpsCoordinateFormat gps_format = 19; - /* + /* * How the GPS coordinates are displayed on the OLED screen. */ enum GpsCoordinateFormat { @@ -103,38 +103,38 @@ message DeviceUIConfig { * DD.DDDDDD DDD.DDDDDD */ DEC = 0; - - /* + + /* * GPS coordinates are displayed in the degrees minutes seconds format: * DD°MM'SS"C DDD°MM'SS"C, where C is the compass point representing the locations quadrant */ - DMS = 1; - + DMS = 1; + /* * Universal Transverse Mercator format: * ZZB EEEEEE NNNNNNN, where Z is zone, B is band, E is easting, N is northing */ UTM = 2; - + /* * Military Grid Reference System format: * ZZB CD EEEEE NNNNN, where Z is zone, B is band, C is the east 100k square, D is the north 100k square, * E is easting, N is northing */ MGRS = 3; - + /* * Open Location Code (aka Plus Codes). */ OLC = 4; - + /* * Ordnance Survey Grid Reference (the National Grid System of the UK). * Format: AB EEEEE NNNNN, where A is the east 100k square, B is the north 100k square, * E is the easting, N is the northing */ OSGR = 5; - + /* * Maidenhead Locator System * Described here: https://en.wikipedia.org/wiki/Maidenhead_Locator_System