From 3ac23db9b166c35e3bd6239d0d7201d5650bdfb4 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Sun, 28 Feb 2021 14:34:30 -0800 Subject: [PATCH] fix bug for emergency function --- bridge_gps_data.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bridge_gps_data.py b/bridge_gps_data.py index e35fb18..0cf2370 100644 --- a/bridge_gps_data.py +++ b/bridge_gps_data.py @@ -187,10 +187,12 @@ 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: - sos_call = user_settings[dmr_id][0]['call'] + '-' + user_settings[dmr_id][1]['ssid'] + 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} + 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)) sos_file.close() @@ -277,7 +279,9 @@ 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) + logger.info('Removing SOS') + elif '@REM SOS' == sms: os.remove('/tmp/gps_data_user_sos.txt') logger.info('Removing SOS')