From e5abb26b83cf2eccc538a55f3532672e14d823f9 Mon Sep 17 00:00:00 2001 From: ford-jones Date: Sat, 13 Sep 2025 13:30:54 +1200 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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; }