From e05b826fd4ac448fdc34549cc0ec0a5e13a21be1 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Thu, 9 Dec 2021 13:43:47 -0800 Subject: [PATCH] fix typo, add experimental comments --- data_gateway.py | 8 +++++++- web/app.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/data_gateway.py b/data_gateway.py index 71bdebd..1913be5 100644 --- a/data_gateway.py +++ b/data_gateway.py @@ -1346,6 +1346,7 @@ def aprs_process(packet): user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read()) for i in user_settings.items(): sms_id = i[0] + print(sms_id) ssid = i[1][1]['ssid'] if i[1][1]['ssid'] == '': ssid = user_ssid @@ -1353,10 +1354,15 @@ def aprs_process(packet): logger.info(aprslib.parse(packet)['from']) mailbox_write(re.sub('-.*','', aprslib.parse(packet)['addresse']), aprslib.parse(packet)['from'], time(), 'From APRS-IS: ' + aprslib.parse(packet)['message_text'], aprslib.parse(packet)['from']) send_sms(False, sms_id, 9, 9, 'unit', str('APRS / ' + str(aprslib.parse(packet)['from']) + ': ' + aprslib.parse(packet)['message_text'])) +## print(UNIT_MAP[bytes_3(sms_id)][1]) +## print(type(UNIT_MAP[bytes_3(sms_id)][1])) +## print(float(datetime.datetime.utcnow().strftime('%s')) - UNIT_MAP[bytes_3(sms_id)][1]) +## +## if float(datetime.datetime.utcnow().strftime('%s')) - UNIT_MAP[bytes_3(sms_id)][1] < 60: try: if 'msgNo' in aprslib.parse(packet): #sleep(1) - +## print(UNIT_MAP) # Write function to check UNIT_MAP and see if X amount of time has passed, if time passed, no ACK. This will prevent multiple gateways from # ACKing. time of 24hrs? logger.info(str(aprslib.parse(packet)['addresse']) + '>APHBL3,TCPIP*:' + ':' + str(aprslib.parse(packet)['from'].ljust(9)) +':ack' + str(aprslib.parse(packet)['msgNo'])) diff --git a/web/app.py b/web/app.py index 5c07630..406eea5 100644 --- a/web/app.py +++ b/web/app.py @@ -7112,7 +7112,7 @@ Name: ''' + p.name + '''  -  Port: ''' + str( ''' for ss in ss_all: ss_log = ss_log + ''' -

''' + ss.callsign + '''

\n

+

''' + ss.callsign + '''

\n

''' + ss.message + '''

'''