fix not parsing altitude extention properly

This commit is contained in:
Rossen Georgiev 2014-11-14 21:34:50 +00:00
parent 85888e96c9
commit dda8879b7d
1 changed files with 6 additions and 4 deletions

10
aprs.py
View File

@ -524,17 +524,17 @@ def parse(raw_sentence):
# try CRS/SPD/ # try CRS/SPD/
match = re.findall(r"^([0-9]{3})/([0-9]{3})/", extra) match = re.findall(r"^([0-9]{3})/([0-9]{3})", extra)
if match: if match:
cse, spd = match[0] cse, spd = match[0]
extra = extra[8:] extra = extra[7:]
parsed.update({'course': int(cse), 'speed': int(spd)*1.852}) # knots to kms parsed.update({'course': int(cse), 'speed': int(spd)*1.852}) # knots to kms
# try BRG/NRQ/ # try BRG/NRQ/
match = re.findall(r"^([0-9]{3})/([0-9]{3})/", extra) match = re.findall(r"^([0-9]{3})/([0-9]{3})", extra)
if match: if match:
brg, nrq = match[0] brg, nrq = match[0]
extra = extra[8:] extra = extra[7:]
parsed.update({'bearing': int(brg), 'nrq': int(nrq)}) parsed.update({'bearing': int(brg), 'nrq': int(nrq)})
#TODO parse PHG #TODO parse PHG
@ -569,6 +569,8 @@ def parse(raw_sentence):
if temp[6] != '': if temp[6] != '':
parsed['telemetry'].update({'bits': "{0:b}" % temp[7]}) parsed['telemetry'].update({'bits': "{0:b}" % temp[7]})
if len(extra) > 0 and extra[0] == "/":
extra = extra[1:]
parsed.update({'comment': extra}) parsed.update({'comment': extra})
else: else: