Skip to content

Commit 6bf1132

Browse files
Reformat with pylint and black.
1 parent 93a8430 commit 6bf1132

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

adafruit_gps.py

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def update(self):
122122
print(sentence)
123123
data_type, args = sentence
124124
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)
126126

127127
# Check for all currently known GNSS talkers
128128
# GA - Galileo
@@ -256,12 +256,13 @@ def _parse_sentence(self):
256256
data_type = sentence[1:delimiter]
257257
return (data_type, sentence[delimiter + 1 :])
258258

259-
def _parse_talker(self, data_type):
259+
@staticmethod
260+
def _parse_talker(data_type):
260261
# Split the data_type into talker and sentence_type
261262
if data_type[0] == b"P": # Proprietary codes
262263
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:])
265266

266267
def _parse_gpgll(self, args):
267268
data = args.split(",")
@@ -448,6 +449,7 @@ def _parse_gpgsa(self, talker, args):
448449

449450
def _parse_gpgsv(self, talker, args):
450451
# Parse the arguments (everything after data type) for NMEA GPGGA
452+
# pylint: disable=too-many-branches
451453
# 3D location fix sentence.
452454
talker = talker.decode("ascii")
453455
data = args.split(",")
@@ -471,15 +473,18 @@ def _parse_gpgsv(self, talker, args):
471473
for i in range(len(sat_tup) // 4):
472474
try:
473475
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+
)
483488
satlist.append(value)
484489
except ValueError:
485490
# Something wasn't an int
@@ -507,8 +512,8 @@ def _parse_gpgsv(self, talker, args):
507512
old.append(i)
508513
for i in old:
509514
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
512517
self._sats.clear()
513518

514519
self.satellites_prev = self.satellites

0 commit comments

Comments
 (0)