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

fix parse bug, md-380 working again

Browse Source
This commit is contained in:
KF7EEL 2020-12-26 12:53:50 -08:00
parent 17999eb3f4
commit 4900f859f8
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gps_data.py
View File

@ -289,8 +289,8 @@ class DATA_SYSTEM(HBSYSTEM):
global n_packet_assembly global n_packet_assembly
#logger.info(_dtype_vseq) #logger.info(_dtype_vseq)
logger.info(time.strftime('%H:%M:%S - %m/%d/%y')) logger.info(time.strftime('%H:%M:%S - %m/%d/%y'))
#logger.info('Special debug for developement:') logger.info('Special debug for developement:')
#logger.info(ahex(bptc_decode(_data))) logger.info(ahex(bptc_decode(_data)))
if int_id(_dst_id) == data_id: if int_id(_dst_id) == data_id:
#logger.info(type(_seq)) #logger.info(type(_seq))
if type(_seq) is bytes: if type(_seq) is bytes:
@ -355,18 +355,18 @@ class DATA_SYSTEM(HBSYSTEM):
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) 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)
logger.info(aprs_loc_packet) logger.info(aprs_loc_packet)
# Attempt to prevent malformed packets from being uploaded. # Attempt to prevent malformed packets from being uploaded.
try: #try:
aprslib.parse(aprs_loc_packet) aprslib.parse(aprs_loc_packet)
float(lat) < 91 float(lat_deg) < 91
float(lon) < 121 float(lon_deg) < 121
aprs_send(aprs_loc_packet) aprs_send(aprs_loc_packet)
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
hdr_type = '' hdr_type = ''
else: # else:
pass # pass
#NMEA type packets for Anytone like radios. #NMEA type packets for Anytone like radios.
elif _call_type == call_type or (_call_type == 'vcsbk' and pckt_seq > 3): #int.from_bytes(_seq, 'big') > 3 ): elif _call_type == call_type or (_call_type == 'vcsbk' and pckt_seq > 3): #int.from_bytes(_seq, 'big') > 3 ):
global packet_assembly global packet_assembly