diff --git a/aprslib/parsing/__init__.py b/aprslib/parsing/__init__.py index fce7aae..b4f0b73 100644 --- a/aprslib/parsing/__init__.py +++ b/aprslib/parsing/__init__.py @@ -45,25 +45,24 @@ from aprslib.parsing.thirdparty import * from aprslib.parsing.weather import * unsupported_formats = { - '#': 'raw weather report', - '$': 'raw gps', - '%': 'agrelo', - '&': 'reserved', - '(': 'unused', - ')': 'item report', - '*': 'complete weather report', - '+': 'reserved', - '-': 'unused', - '.': 'reserved', - '<': 'station capabilities', - '?': 'general query format', - '[': 'maidenhead locator beacon', - '\\': 'unused', - ']': 'unused', - '^': 'unused', + '#':'raw weather report', + '$':'raw gps', + '%':'agrelo', + '&':'reserved', + '(':'unused', + ')':'item report', + '*':'complete weather report', + '+':'reserved', + '-':'unused', + '.':'reserved', + '<':'station capabilities', + '?':'general query format', + '[':'maidenhead locator beacon', + '\\':'unused', + ']':'unused', + '^':'unused', } - def _unicode_packet(packet): # attempt utf-8 try: @@ -114,7 +113,7 @@ def parse(packet): parsed = { 'raw': packet, - } + } # parse head try: @@ -149,7 +148,7 @@ def parse(packet): parsed.update({ 'format': 'beacon', 'text': packet_type + body, - }) + }) logger.debug("Parsed ok.") return parsed diff --git a/aprslib/parsing/telemetry.py b/aprslib/parsing/telemetry.py index 50ecca7..ccd7c60 100644 --- a/aprslib/parsing/telemetry.py +++ b/aprslib/parsing/telemetry.py @@ -24,19 +24,19 @@ def parse_comment_telemetry(text): temp = [0] * 7 for i in range(7): - temp[i] = base91.to_decimal(telemetry[i * 2:i * 2 + 2]) + temp[i] = base91.to_decimal(telemetry[i*2:i*2+2]) parsed.update({ 'telemetry': { 'seq': temp[0], 'vals': temp[1:6] - } - }) + } + }) if temp[6] != '': parsed['telemetry'].update({ 'bits': "{0:08b}".format(temp[6] & 0xFF)[::-1] - }) + }) return (text, parsed) @@ -63,14 +63,14 @@ def parse_telemetry_config(body): parsed.update({ 't%s' % form: defvals - }) + }) elif form == "EQNS": eqns = body.rstrip().split(',')[:15] teqns = [0, 1, 0] * 5 for idx, val in enumerate(eqns): if not re.match(r"^([-]?\d*\.?\d+|)$", val): - raise ParseError("value at %d is not a number in %s" % (idx + 1, form)) + raise ParseError("value at %d is not a number in %s" % (idx+1, form)) else: try: val = int(val) @@ -80,11 +80,11 @@ def parse_telemetry_config(body): teqns[idx] = val # group values in 5 list of 3 - teqns = [teqns[i * 3:(i + 1) * 3] for i in range(5)] + teqns = [teqns[i*3:(i+1)*3] for i in range(5)] parsed.update({ 't%s' % form: teqns - }) + }) elif form == "BITS": match = re.findall(r"^([01]{8}),(.{0,23})$", body.rstrip()) if not match: @@ -95,7 +95,7 @@ def parse_telemetry_config(body): parsed.update({ 't%s' % form: bits, 'title': title.strip(' ') - }) + }) return (body, parsed)