rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-29 22:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make use of pre-existing channel_settings.module_settings.is_client_muted setting

Browse Source
This commit is contained in:
ford-jones
2025-09-13 13:39:32 +12:00
parent e0890b2a13
commit ccff2769fe
6 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/ExternalNotificationModule.cpp
View File

@@ -510,7 +510,8 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
}
}
if (moduleConfig.external_notification.alert_message && !sender->is_muted && !ch.settings.mute) {
if (moduleConfig.external_notification.alert_message && !sender->is_muted &&
!ch.settings.module_settings.is_client_muted) {
LOG_INFO("externalNotificationModule - Notification Module");
isNagging = true;
setExternalState(0, true);
@@ -521,7 +522,8 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
}
}
if (moduleConfig.external_notification.alert_message_vibra && !sender->is_muted && !ch.settings.mute) {
if (moduleConfig.external_notification.alert_message_vibra && !sender->is_muted &&
!ch.settings.module_settings.is_client_muted) {
LOG_INFO("externalNotificationModule - Notification Module (Vibra)");
isNagging = true;
setExternalState(1, true);
@@ -532,7 +534,8 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
}
}
if (moduleConfig.external_notification.alert_message_buzzer && !sender->is_muted && !ch.settings.mute) {
if (moduleConfig.external_notification.alert_message_buzzer && !sender->is_muted &&
!ch.settings.module_settings.is_client_muted) {
LOG_INFO("externalNotificationModule - Notification Module (Buzzer)");
isNagging = true;
if (!moduleConfig.external_notification.use_pwm && !moduleConfig.external_notification.use_i2s_as_buzzer) {