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

add option to disable APRS upload

Browse Source
This commit is contained in:
KF7EEL 2021-02-04 10:06:09 -08:00
parent 08f53ee1a4
commit 21a0c95ad3
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gps_data-SAMPLE.cfg
View File

@ -119,6 +119,8 @@ DATA_DMR_ID: 9099
CALL_TYPE: unit CALL_TYPE: unit
USER_APRS_SSID: 15 USER_APRS_SSID: 15
USER_APRS_COMMENT: HBLink3 D-APRS - USER_APRS_COMMENT: HBLink3 D-APRS -
# Setting APRS_LOGIN_CALL to N0CALL will cause the gateway to not upload packets to APRS server.
APRS_LOGIN_CALL: N0CALL APRS_LOGIN_CALL: N0CALL
APRS_LOGIN_PASSCODE: 12345 APRS_LOGIN_PASSCODE: 12345
APRS_SERVER: rotate.aprs2.net APRS_SERVER: rotate.aprs2.net

24
gps_data.py
View File

@ -141,10 +141,15 @@ def header_ID(_data):
## pass ## pass
def aprs_send(packet): def aprs_send(packet):
AIS = aprslib.IS(aprs_callsign, passwd=aprs_passcode,host=aprs_server, port=aprs_port) if aprs_callsign == 'N0CALL':
AIS.connect() logger.info('APRS callsighn set to N0CALL, packet not sent.')
AIS.sendall(packet) pass
AIS.close() else:
AIS = aprslib.IS(aprs_callsign, passwd=aprs_passcode,host=aprs_server, port=aprs_port)
AIS.connect()
AIS.sendall(packet)
AIS.close()
logger.info('Packet sent to APRS-IS.')
def dashboard_loc_write(call, lat, lon, time): def dashboard_loc_write(call, lat, lon, time):
#try: #try:
@ -288,13 +293,8 @@ def process_sms(_rf_src, sms):
lat_dir = 'N' lat_dir = 'N'
#logger.info(lat) #logger.info(lat)
#logger.info(lat_dir) #logger.info(lat_dir)
#aprs_lat = str(str(re.sub('\..*|-', '', str(lat[0]))) + str(re.sub('\..*', '', str(lat[1])) + '.').ljust(5) + lat_dir)
#aprs_lon = str(str(re.sub('\..*|-', '', str(lon[0]))) + str(re.sub('\..*', '', str(lon[1])) + '.').ljust(5) + lon_dir)
aprs_lat = str(str(re.sub('\..*|-', '', str(lat[0]))) + str(re.sub('\..*', '', str(lat[1])) + '.')).zfill(5) + ' ' + lat_dir aprs_lat = str(str(re.sub('\..*|-', '', str(lat[0]))) + str(re.sub('\..*', '', str(lat[1])) + '.')).zfill(5) + ' ' + lat_dir
aprs_lon = str(str(re.sub('\..*|-', '', str(lon[0]))) + str(re.sub('\..*', '', str(lon[1])) + '.')).zfill(6) + ' ' + lon_dir aprs_lon = str(str(re.sub('\..*|-', '', str(lon[0]))) + str(re.sub('\..*', '', str(lon[1])) + '.')).zfill(6) + ' ' + lon_dir
#logger.info(mh.to_location(grid_square))
#logger.info(str(lat) + ', ' + str(lon))
logger.info('Latitude: ' + str(aprs_lat)) logger.info('Latitude: ' + str(aprs_lat))
logger.info('Longitude: ' + str(aprs_lon)) logger.info('Longitude: ' + str(aprs_lon))
user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read()) user_settings = ast.literal_eval(os.popen('cat ./user_settings.txt').read())
@ -321,7 +321,7 @@ def process_sms(_rf_src, sms):
aprslib.parse(aprs_loc_packet) aprslib.parse(aprs_loc_packet)
aprs_send(aprs_loc_packet) aprs_send(aprs_loc_packet)
dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.strftime('%H:%M:%S - %m/%d/%y')) dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.strftime('%H:%M:%S - %m/%d/%y'))
logger.info('Sent manual position to APRS') #logger.info('Sent manual position to APRS')
except: except:
logger.info('Exception. Not uploaded') logger.info('Exception. Not uploaded')
packet_assembly = '' packet_assembly = ''
@ -342,7 +342,7 @@ def process_sms(_rf_src, sms):
try: try:
aprslib.parse(aprs_msg_pkt) aprslib.parse(aprs_msg_pkt)
aprs_send(aprs_msg_pkt) aprs_send(aprs_msg_pkt)
logger.info('Packet sent.') #logger.info('Packet sent.')
except: except:
logger.info('Error uploading MSG packet.') logger.info('Error uploading MSG packet.')
try: try:
@ -445,7 +445,7 @@ class DATA_SYSTEM(HBSYSTEM):
float(lon_deg) < 121 float(lon_deg) < 121
aprs_send(aprs_loc_packet) aprs_send(aprs_loc_packet)
dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.strftime('%H:%M:%S - %m/%d/%y')) dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.strftime('%H:%M:%S - %m/%d/%y'))
logger.info('Sent APRS packet') #logger.info('Sent APRS packet')
except: except:
logger.info('Error. Failed to send packet. Packet may be malformed.') logger.info('Error. Failed to send packet. Packet may be malformed.')
udt_block = 1 udt_block = 1