From 7febe66a7681dd54b85918e6fa6d8a727b119fa0 Mon Sep 17 00:00:00 2001
From: KF7EEL <kf7eel@qsl.net>
Date: Sun, 28 Feb 2021 17:01:32 -0800
Subject: [PATCH] add notice function as an alternative to emergency

---
 bridge_gps_data.py             | 2 +-
 gps_data.py                    | 4 ++--
 scripts/dashboard/dashboard.py | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bridge_gps_data.py b/bridge_gps_data.py
index 77f9f1f..62117ea 100755
--- a/bridge_gps_data.py
+++ b/bridge_gps_data.py
@@ -280,7 +280,7 @@ def process_sms(_rf_src, sms):
             logger.info('Failed to send email.')
             logger.info(error_exception)
             logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
-    elif '@SOS' in sms:
+    elif '@SOS' in sms or '@NOTICE' in sms:
         sos_write(int_id(_rf_src), time.strftime('%H:%M:%S - %m/%d/%y'), sms)
     elif '@REM SOS' == sms:
         os.remove('/tmp/gps_data_user_sos.txt')
diff --git a/gps_data.py b/gps_data.py
index e7e71fd..01d75a7 100644
--- a/gps_data.py
+++ b/gps_data.py
@@ -272,11 +272,11 @@ def process_sms(_rf_src, sms):
             logger.info('Failed to send email.')
             logger.info(error_exception)
             logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
-    elif '@SOS' in sms:
+    elif '@SOS' in sms or '@NOTICE' in sms:
         sos_write(int_id(_rf_src), time.strftime('%H:%M:%S - %m/%d/%y'), sms)
     elif '@REM SOS' == sms:
         os.remove('/tmp/gps_data_user_sos.txt')
-        logger.info('Removing SOS')
+        logger.info('Removing SOS or Notice')
     elif '@MH' in sms:
         grid_square = re.sub('@MH ', '', sms)
         if len(grid_square) < 6:
diff --git a/scripts/dashboard/dashboard.py b/scripts/dashboard/dashboard.py
index f3ac2bb..30dd1e0 100644
--- a/scripts/dashboard/dashboard.py
+++ b/scripts/dashboard/dashboard.py
@@ -119,8 +119,12 @@ def check_emergency():
     # open emergency txt
     try:
         sos_file = ast.literal_eval(os.popen('cat /tmp/gps_data_user_sos.txt').read())
+        if '@NOTICE' in sos_file['message'] and '@SOS' not in sos_file['message']:
+            notice_header = '<span style="background-color: #ffffff; color: #008000;">NOTICE:</span>'
+        else:
+            notice_header = '<span style="background-color: #ff0000; color: #ffffff;">EMERGENCY ACTIVATION</span>'
         value = Markup("""
-        <h1 style="text-align: center;"><span style="background-color: #ff0000; color: #ffffff;">EMERGENCY ACTIVATION</span></h1>
+        <h1 style="text-align: center;">""" +  notice_header  + """</h1>
         <p>&nbsp;</p>
         <table style="width: 441px; margin-left: auto; margin-right: auto;" border="3">
         <tbody>