diff --git a/mesh_bot.py b/mesh_bot.py index d6ac6bc..02c6972 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -1581,8 +1581,10 @@ def handle_boot(mesh=True): if my_settings.bee_enabled: logger.debug("System: File Monitor Bee Monitor Enabled for bee.txt") - if my_settings.anyAlertBroadcastEnabled: + if my_settings.usAlerts: logger.debug(f"System: Emergency Alert Broadcast Enabled on channel {my_settings.emergency_responder_alert_channel} for interface {my_settings.emergency_responder_alert_interface}") + if my_settings.enableDEalerts: + logger.debug(f"System: NINA Alerts Enabled with counties {my_settings.myRegionalKeysDE}") if my_settings.volcanoAlertBroadcastEnabled: logger.debug(f"System: Volcano Alert Broadcast Enabled on channels {my_settings.emergency_responder_alert_channel} ignoreUSGSWords {my_settings.ignoreUSGSWords}") if my_settings.ipawsAlertEnabled: diff --git a/modules/system.py b/modules/system.py index 07b0e03..5d1147e 100644 --- a/modules/system.py +++ b/modules/system.py @@ -1160,8 +1160,8 @@ def handleAlertBroadcast(deviceID=1): ("wx", wxAlert, wxAlertBroadcastEnabled), ("volcano", volcanoAlert, volcanoAlertBroadcastEnabled),] - if deAlerts: - alert_types.append(("de", deAlerts, enableDEalerts)) + if enableDEalerts: + alert_types = [("de", deAlerts, enableDEalerts)] for alert_type, alert_msg, enabled in alert_types: if enabled and alert_msg and NO_ALERTS not in alert_msg and ERROR_FETCHING_DATA not in alert_msg: