From 09c2ee5b4cbc7016ef86fa7b947dded8b14d5143 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Sun, 25 Apr 2021 13:37:05 -0700 Subject: [PATCH] add position count to beacon comment --- full_bridge.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/full_bridge.py b/full_bridge.py index b37d8e2..b09e741 100644 --- a/full_bridge.py +++ b/full_bridge.py @@ -479,6 +479,7 @@ def process_sms(_rf_src, sms): if user_settings[int_id(_rf_src)][3]['comment'] != '': comment = user_settings[int_id(_rf_src)][3]['comment'] aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(aprs_lat) + icon_table + str(aprs_lon) + icon_icon + '/' + str(comment) + pos_count + 1 logger.info(aprs_loc_packet) logger.info('User comment: ' + comment) logger.info('User SSID: ' + ssid) @@ -917,7 +918,7 @@ def aprs_rx(aprs_rx_login, aprs_passcode, aprs_server, aprs_port, aprs_filter, u logger.info(e) # Sends beacon packet for gateway def aprs_beacon_send(): - beacon_packet = CONFIG['GPS_DATA']['APRS_LOGIN_CALL'] + '>APHBL3,TCPIP*:!' + CONFIG['GPS_DATA']['IGATE_LATITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][0]) + CONFIG['GPS_DATA']['IGATE_LONGITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][1]) + '/' + CONFIG['GPS_DATA']['IGATE_BEACON_COMMENT'] + beacon_packet = CONFIG['GPS_DATA']['APRS_LOGIN_CALL'] + '>APHBL3,TCPIP*:!' + CONFIG['GPS_DATA']['IGATE_LATITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][0]) + CONFIG['GPS_DATA']['IGATE_LONGITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][1]) + '/' + CONFIG['GPS_DATA']['IGATE_BEACON_COMMENT'] + 'GPS Sent: ' + str(pos_count) aprs_send(beacon_packet) logger.info(beacon_packet) @@ -2021,6 +2022,7 @@ class routerHBP(HBSYSTEM): float(lat_deg) < 91 float(lon_deg) < 121 aprs_send(aprs_loc_packet) + pos_count + 1 dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time(), comment) #logger.info('Sent APRS packet') except Exception as error_exception: @@ -2107,6 +2109,7 @@ class routerHBP(HBSYSTEM): if user_settings[int_id(_rf_src)][3]['comment'] != '': comment = user_settings[int_id(_rf_src)][3]['comment'] aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + icon_table + str(loc.lon[0:8]) + str(loc.lon_dir) + icon_icon + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + str(comment) + pos_count + 1 logger.info(aprs_loc_packet) logger.info('User comment: ' + comment) logger.info('User SSID: ' + ssid) @@ -2114,6 +2117,7 @@ class routerHBP(HBSYSTEM): except Exception as error_exception: logger.info('Error or user settings file not found, proceeding with default settings.') aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(user_ssid) + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + '/' + str(loc.lon[0:8]) + str(loc.lon_dir) + '[' + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) + pos_count + 1 logger.info(error_exception) logger.info(str(traceback.extract_tb(error_exception.__traceback__))) try: @@ -2232,6 +2236,7 @@ class bridgeReportFactory(reportFactory): #************************************************ if __name__ == '__main__': + global pos_count import argparse import sys import os @@ -2282,6 +2287,8 @@ if __name__ == '__main__': user_settings_file = CONFIG['GPS_DATA']['USER_SETTINGS_FILE'] use_api = CONFIG['GPS_DATA']['USE_API'] + # Count the number of positions igeted, initialize + pos_count = 0 # Check if user_settings (for APRS settings of users) exists. Creat it if not. if Path(user_settings_file).is_file():