ShaYmez/hbnet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update emergency function

Browse Source
This commit is contained in:
KF7EEL 2021-02-28 14:37:23 -08:00
parent d84e937c1f
commit 3368683a1f
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bridge_gps_data.py
View File

@ -187,9 +187,13 @@ def dashboard_bb_write(call, dmr_id, time, bulletin):
def sos_write(dmr_id, time, message):
user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read())
try:
if user_settings[dmr_id][1]['ssid'] == '':
sos_call = user_settings[dmr_id][0]['call'] + '-' + user_ssid
else:
sos_call = user_settings[dmr_id][0]['call'] + '-' + user_settings[dmr_id][1]['ssid']
except:
sos_call = str(get_alias((dmr_id), subscriber_ids))
sos_info = {'call': sos_call, 'dmr_id': dmr_id, 'time': time, 'message':message}
with open("/tmp/gps_data_user_sos.txt", 'w') as sos_file:
sos_file.write(str(sos_info))
@ -277,7 +281,7 @@ def process_sms(_rf_src, sms):
logger.info(error_exception)
logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
elif '@SOS' in sms:
sos_write(int_id(_rf_src), 'time', 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')

5
gps_data.py
View File

@ -180,6 +180,9 @@ def dashboard_bb_write(call, dmr_id, time, bulletin):
def sos_write(dmr_id, time, message):
user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read())
try:
if user_settings[dmr_id][1]['ssid'] == '':
sos_call = user_settings[dmr_id][0]['call'] + '-' + user_ssid
else:
sos_call = user_settings[dmr_id][0]['call'] + '-' + user_settings[dmr_id][1]['ssid']
except:
sos_call = str(get_alias((dmr_id), subscriber_ids))
@ -270,7 +273,7 @@ def process_sms(_rf_src, sms):
logger.info(error_exception)
logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
elif '@SOS' in sms:
sos_write(int_id(_rf_src), 'time', 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')

9
scripts/dashboard/dashboard.py
View File

@ -140,6 +140,7 @@ def check_emergency():
</table>
<p>&nbsp;</p>
<button onclick="window.open('view_map?track=""" + sos_file['call'] + """&reload=30','_blank' );" type="button" class="emergency_button"><h1>View Station on Map</h1></button>
<p style="text-align: center;"><a href="https://aprs.fi/""" + sos_file['call'] + """"><strong>View on aprs.fi</strong></a></p>
<hr />
""")
@ -296,7 +297,7 @@ def map():
@app.route('/bulletin_rss.xml')
def bb_rss():
#return render_template('map.html', title = dashboard_title, logo = logo)
try:
dash_bb = ast.literal_eval(os.popen('cat /tmp/gps_data_user_bb.txt').read())
post_data = ''
rss_header = """<?xml version="1.0" encoding="UTF-8" ?>
@ -312,7 +313,9 @@ def bb_rss():
<link>""" + rss_link + """</link>
<description>""" + entry['bulletin'] + """ - """ + entry['time'] + """</description>
</item>
"""
return Response(rss_header + post_data + "</channel>\n</rss>", mimetype='text/xml')
"""
return Response(rss_header + post_data + "\n</channel>\n</rss>", mimetype='text/xml')
except:
return str('<h1 style="text-align: center;">No data</h1>')
if __name__ == '__main__':
app.run(debug = True, port=dash_port, host=dash_host)