enhanceEmergency Alerting

modules/settings.py

@@ -155,28 +155,23 @@ try:
     latitudeValue = config['location'].getfloat('lat', 48.50)
     longitudeValue = config['location'].getfloat('lon', -123.0)
     use_meteo_wxApi = config['location'].getboolean('UseMeteoWxAPI', False) # default False use NOAA
-    enableGBalerts = config['location'].getboolean('enableGBalerts', False) # default False
     use_metric = config['location'].getboolean('useMetric', False) # default Imperial units
-    forecastDuration = config['location'].getint('NOAAforecastDuration', 4) # NOAA forcast days
-    numWxAlerts = config['location'].getint('NOAAalertCount', 2) # default 2 alerts
-    wxAlertsEnabled = config['location'].getboolean('NOAAalertsEnabled', True) # default True not enabled yet
     repeater_lookup = config['location'].get('repeaterLookup', 'rbook') # default repeater lookup source
-    mySAME = config['location'].get('mySAME', '').split(',') # default empty
-    ipawsPIN = config['location'].get('ipawsPIN', '000000') # default 000000
-    femaAlertBroadcastEnabled = config['location'].getboolean('femaAlertBroadcastEnabled', False) # default False
-    femaAlertBroadcastCh = config['location'].get('femaAlertBroadcastCh', '2').split(',') # default Channel 2
-    wxAlertBroadcastEnabled = config['location'].getboolean('wxAlertBroadcastEnabled', False) # default False
-    ignoreFEMAtest = config['location'].getboolean('ignoreFEMAtest', True) # default True
     n2yoAPIKey = config['location'].get('n2yoAPIKey', '') # default empty
     satListConfig = config['location'].get('satList', '25544').split(',') # default 25544 ISS
     riverListDefault = config['location'].get('riverList', '').split(',') # default 12061500 Skagit River
-    # brodcast channel for weather alerts
+    # location alerts
+    emergencyAlertBrodcastEnabled = config['location'].getboolean('eAlertBroadcastEnabled', False) # default False
+    wxAlertBroadcastEnabled = config['location'].getboolean('wxAlertBroadcastEnabled', False) # default False
+    enableGBalerts = config['location'].getboolean('enableGBalerts', False) # default False
+    wxAlertsEnabled = config['location'].getboolean('NOAAalertsEnabled', True) # default True
+    mySAME = config['location'].get('mySAME', '').split(',') # default empty
+    forecastDuration = config['location'].getint('NOAAforecastDuration', 4) # NOAA forcast days
+    numWxAlerts = config['location'].getint('NOAAalertCount', 2) # default 2 alerts
+    ipawsPIN = config['location'].get('ipawsPIN', '000000') # default 000000
+    ignoreFEMAtest = config['location'].getboolean('ignoreFEMAtest', True) # default True
     wxAlertBroadcastChannel = config['location'].get('wxAlertBroadcastCh')
-    if wxAlertBroadcastChannel:
-        if ',' in wxAlertBroadcastChannel:
-            wxAlertBroadcastChannel = config['location'].get('wxAlertBroadcastCh').split(',')
-        else:
-            wxAlertBroadcastChannel = config['location'].getint('wxAlertBroadcastCh', 2) # default 2
+    emergencyAlertBroadcastCh = config['location'].get('eAlertBroadcastCh', '2').split(',') # default Channel 2
     
     # bbs
     bbs_enabled = config['bbs'].getboolean('enabled', False)

modules/system.py

@@ -665,7 +665,7 @@ def handleMultiPing(nodeID=0, deviceID=1):
                             break
 
 
-def handleWxBroadcast(deviceID=1):
+def handleAlertBroadcast(deviceID=1):
     # only allow API call every 20 minutes
     # the watchdog will call this function 3 times, seeing possible throttling on the API
     clock = datetime.now()
@@ -675,15 +675,42 @@ def handleWxBroadcast(deviceID=1):
         return False
     
     # check for alerts
-    alert = alertBrodcastNOAA()
-    if alert:
-        msg = f"🚨 {alert[1]} EAS ALERTs: {alert[0]}"
-        if isinstance(wxAlertBroadcastChannel, list):
-            for channel in wxAlertBroadcastChannel:
-                send_message(msg, int(channel), 0, deviceID)
-        else:
-            send_message(msg, wxAlertBroadcastChannel, 0, deviceID)
-        return True
+    alertWx = alertBrodcastNOAA()
+    alertFema = getIpawsAlert(latitudeValue,longitudeValue, shortAlerts=True)
+    alertUk = get_govUK_alerts(latitudeValue, longitudeValue)
+
+    # format alert
+    wxAlert = f"🚨 {alertWx[1]} EAS WX ALERT: {alertWx[0]}"
+    femaAlert = alertFema
+    ukAlert = alertUk
+
+    if emergencyAlertBrodcastEnabled:
+        if NO_ALERTS not in femaAlert:
+            if isinstance(emergencyAlertBroadcastCh, list):
+                for channel in emergencyAlertBroadcastCh:
+                    send_message(femaAlert, int(channel), 0, deviceID)
+            else:
+                send_message(femaAlert, emergencyAlertBroadcastCh, 0, deviceID)
+            return True
+        if NO_ALERTS not in ukAlert:
+            if isinstance(emergencyAlertBroadcastCh, list):
+                for channel in emergencyAlertBroadcastCh:
+                    send_message(ukAlert, int(channel), 0, deviceID)
+            else:
+                send_message(ukAlert, emergencyAlertBroadcastCh, 0, deviceID)
+            return True
+        
+    # pause for 10 seconds
+    time.sleep(10)
+
+    if wxAlertBroadcastEnabled:
+        if wxAlert:
+            if isinstance(wxAlertBroadcastChannel, list):
+                for channel in wxAlertBroadcastChannel:
+                    send_message(wxAlert, int(channel), 0, deviceID)
+            else:
+                send_message(wxAlert, wxAlertBroadcastChannel, 0, deviceID)
+            return True
 
 def onDisconnect(interface):
     global retry_int1, retry_int2
@@ -1090,8 +1117,10 @@ async def watchdog():
                 # multiPing handler
                 handleMultiPing(0,1)
 
-                if wxAlertBroadcastEnabled:
-                    handleWxBroadcast(1)
+                # Alert Broadcast
+                if wxAlertBroadcastEnabled or emergencyAlertBrodcastEnabled:
+                    # weather alerts
+                    handleAlertBroadcast(1)
 
                 # Telemetry data
                 int1Data = displayNodeTelemetry(0, 1)
@@ -1120,10 +1149,12 @@ async def watchdog():
                         await handleSentinel(2)
 
                     # multiPing handler
-                    handleMultiPing(0,2)
+                    handleMultiPing(0,1)
 
-                    if wxAlertBroadcastEnabled:
-                        handleWxBroadcast(2)
+                    # Alert Broadcast
+                    if wxAlertBroadcastEnabled or emergencyAlertBrodcastEnabled:
+                        # weather alerts
+                        handleAlertBroadcast(1)
 
                 # Telemetry data
                 int2Data = displayNodeTelemetry(0, 2)