ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-18 01:11:42 +10:00
Code Releases Activity

Decouple node-mute from channel-mute

Browse Source
This commit is contained in:
ford-jones
2025-09-23 11:40:45 +12:00
parent 319cd6fa7b
commit e7840122e8
5 changed files with 7 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/AdminModule.cpp
-18
View File
@@ -369,24 +369,6 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
}
break;
}
case meshtastic_AdminMessage_set_muted_node_tag: {
LOG_INFO("Client received set_muted_node command");
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(r->set_muted_node);
if (node != NULL) {
node->is_muted = true;
saveChanges(SEGMENT_NODEDATABASE, false);
}
break;
}
case meshtastic_AdminMessage_remove_muted_node_tag: {
LOG_INFO("Client received remove_muted_node command");
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(r->remove_muted_node);
if (node != NULL) {
node->is_muted = false;
saveChanges(SEGMENT_NODEDATABASE, false);
}
break;
}
case meshtastic_AdminMessage_set_fixed_position_tag: {
LOG_INFO("Client received set_fixed_position command");
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeDB->getNodeNum());
src/modules/ExternalNotificationModule.cpp
+3 -3
View File
@@ -510,7 +510,7 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
}
}
if (moduleConfig.external_notification.alert_message && !sender->is_muted && !ch.settings.mute) {
if (moduleConfig.external_notification.alert_message && !ch.settings.mute) {
LOG_INFO("externalNotificationModule - Notification Module");
isNagging = true;
setExternalState(0, true);
@@ -521,7 +521,7 @@ 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 && !ch.settings.mute) {
LOG_INFO("externalNotificationModule - Notification Module (Vibra)");
isNagging = true;
setExternalState(1, true);
@@ -532,7 +532,7 @@ 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 && !ch.settings.mute) {
LOG_INFO("externalNotificationModule - Notification Module (Buzzer)");
isNagging = true;
if (!moduleConfig.external_notification.use_pwm && !moduleConfig.external_notification.use_i2s_as_buzzer) {