@@ -122,7 +122,7 @@ def update(self):
122
122
print (sentence )
123
123
data_type , args = sentence
124
124
data_type = bytes (data_type .upper (), "ascii" )
125
- (talker , sentence_type ) = self ._parse_talker (data_type )
125
+ (talker , sentence_type ) = GPS ._parse_talker (data_type )
126
126
127
127
# Check for all currently known GNSS talkers
128
128
# GA - Galileo
@@ -256,12 +256,13 @@ def _parse_sentence(self):
256
256
data_type = sentence [1 :delimiter ]
257
257
return (data_type , sentence [delimiter + 1 :])
258
258
259
- def _parse_talker (self , data_type ):
259
+ @staticmethod
260
+ def _parse_talker (data_type ):
260
261
# Split the data_type into talker and sentence_type
261
262
if data_type [0 ] == b"P" : # Proprietary codes
262
263
return (data_type [:1 ], data_type [1 :])
263
- else :
264
- return (data_type [:2 ], data_type [2 :])
264
+
265
+ return (data_type [:2 ], data_type [2 :])
265
266
266
267
def _parse_gpgll (self , args ):
267
268
data = args .split ("," )
@@ -448,6 +449,7 @@ def _parse_gpgsa(self, talker, args):
448
449
449
450
def _parse_gpgsv (self , talker , args ):
450
451
# Parse the arguments (everything after data type) for NMEA GPGGA
452
+ # pylint: disable=too-many-branches
451
453
# 3D location fix sentence.
452
454
talker = talker .decode ("ascii" )
453
455
data = args .split ("," )
@@ -471,15 +473,18 @@ def _parse_gpgsv(self, talker, args):
471
473
for i in range (len (sat_tup ) // 4 ):
472
474
try :
473
475
j = i * 4
474
- # Satellite number
475
- satnum = "{}{}" .format (talker , _parse_int (sat_tup [0 + j ]))
476
- # Elevation in degrees
477
- satdeg = _parse_int (sat_tup [1 + j ])
478
- # Azimuth in degrees
479
- satazim = _parse_int (sat_tup [2 + j ])
480
- # signal-to-noise ratio in dB
481
- satsnr = _parse_int (sat_tup [3 + j ])
482
- value = (satnum , satdeg , satazim , satsnr , timestamp )
476
+ value = (
477
+ # Satellite number
478
+ "{}{}" .format (talker , _parse_int (sat_tup [0 + j ])),
479
+ # Elevation in degrees
480
+ _parse_int (sat_tup [1 + j ]),
481
+ # Azimuth in degrees
482
+ _parse_int (sat_tup [2 + j ]),
483
+ # signal-to-noise ratio in dB
484
+ _parse_int (sat_tup [3 + j ]),
485
+ # Timestamp
486
+ timestamp ,
487
+ )
483
488
satlist .append (value )
484
489
except ValueError :
485
490
# Something wasn't an int
@@ -507,8 +512,8 @@ def _parse_gpgsv(self, talker, args):
507
512
old .append (i )
508
513
for i in old :
509
514
self .sats .pop (i )
510
- for s in self ._sats :
511
- self .sats [s [0 ]] = s
515
+ for sat in self ._sats :
516
+ self .sats [sat [0 ]] = sat
512
517
self ._sats .clear ()
513
518
514
519
self .satellites_prev = self .satellites
0 commit comments