File tree Expand file tree Collapse file tree 3 files changed +29
-29
lines changed
Expand file tree Collapse file tree 3 files changed +29
-29
lines changed Original file line number Diff line number Diff line change 33* .pyc
44dist
55* .egg-info
6- .gitignore
6+ env3
7+ env2
78.idea
Original file line number Diff line number Diff line change @@ -45,25 +45,24 @@ def detect(x):
4545from aprslib .parsing .weather import *
4646
4747unsupported_formats = {
48- '#' : 'raw weather report' ,
49- '$' : 'raw gps' ,
50- '%' : 'agrelo' ,
51- '&' : 'reserved' ,
52- '(' : 'unused' ,
53- ')' : 'item report' ,
54- '*' : 'complete weather report' ,
55- '+' : 'reserved' ,
56- '-' : 'unused' ,
57- '.' : 'reserved' ,
58- '<' : 'station capabilities' ,
59- '?' : 'general query format' ,
60- '[' : 'maidenhead locator beacon' ,
61- '\\ ' : 'unused' ,
62- ']' : 'unused' ,
63- '^' : 'unused' ,
48+ '#' : 'raw weather report' ,
49+ '$' : 'raw gps' ,
50+ '%' : 'agrelo' ,
51+ '&' : 'reserved' ,
52+ '(' : 'unused' ,
53+ ')' : 'item report' ,
54+ '*' : 'complete weather report' ,
55+ '+' : 'reserved' ,
56+ '-' : 'unused' ,
57+ '.' : 'reserved' ,
58+ '<' : 'station capabilities' ,
59+ '?' : 'general query format' ,
60+ '[' : 'maidenhead locator beacon' ,
61+ '\\ ' : 'unused' ,
62+ ']' : 'unused' ,
63+ '^' : 'unused' ,
6464}
6565
66-
6766def _unicode_packet (packet ):
6867 # attempt utf-8
6968 try :
@@ -114,7 +113,7 @@ def parse(packet):
114113
115114 parsed = {
116115 'raw' : packet ,
117- }
116+ }
118117
119118 # parse head
120119 try :
@@ -149,7 +148,7 @@ def parse(packet):
149148 parsed .update ({
150149 'format' : 'beacon' ,
151150 'text' : packet_type + body ,
152- })
151+ })
153152
154153 logger .debug ("Parsed ok." )
155154 return parsed
Original file line number Diff line number Diff line change @@ -24,19 +24,19 @@ def parse_comment_telemetry(text):
2424
2525 temp = [0 ] * 7
2626 for i in range (7 ):
27- temp [i ] = base91 .to_decimal (telemetry [i * 2 :i * 2 + 2 ])
27+ temp [i ] = base91 .to_decimal (telemetry [i * 2 :i * 2 + 2 ])
2828
2929 parsed .update ({
3030 'telemetry' : {
3131 'seq' : temp [0 ],
3232 'vals' : temp [1 :6 ]
33- }
34- })
33+ }
34+ })
3535
3636 if temp [6 ] != '' :
3737 parsed ['telemetry' ].update ({
3838 'bits' : "{0:08b}" .format (temp [6 ] & 0xFF )[::- 1 ]
39- })
39+ })
4040
4141 return (text , parsed )
4242
@@ -63,14 +63,14 @@ def parse_telemetry_config(body):
6363
6464 parsed .update ({
6565 't%s' % form : defvals
66- })
66+ })
6767 elif form == "EQNS" :
6868 eqns = body .rstrip ().split (',' )[:15 ]
6969 teqns = [0 , 1 , 0 ] * 5
7070
7171 for idx , val in enumerate (eqns ):
7272 if not re .match (r"^([-]?\d*\.?\d+|)$" , val ):
73- raise ParseError ("value at %d is not a number in %s" % (idx + 1 , form ))
73+ raise ParseError ("value at %d is not a number in %s" % (idx + 1 , form ))
7474 else :
7575 try :
7676 val = int (val )
@@ -80,11 +80,11 @@ def parse_telemetry_config(body):
8080 teqns [idx ] = val
8181
8282 # group values in 5 list of 3
83- teqns = [teqns [i * 3 :(i + 1 ) * 3 ] for i in range (5 )]
83+ teqns = [teqns [i * 3 :(i + 1 ) * 3 ] for i in range (5 )]
8484
8585 parsed .update ({
8686 't%s' % form : teqns
87- })
87+ })
8888 elif form == "BITS" :
8989 match = re .findall (r"^([01]{8}),(.{0,23})$" , body .rstrip ())
9090 if not match :
@@ -95,7 +95,7 @@ def parse_telemetry_config(body):
9595 parsed .update ({
9696 't%s' % form : bits ,
9797 'title' : title .strip (' ' )
98- })
98+ })
9999
100100 return (body , parsed )
101101
You can’t perform that action at this time.
0 commit comments