adafruit-circuitpython-gps 3.11.10__tar.gz → 4.0.0__tar.gz

{adafruit_circuitpython_gps-3.11.10 → adafruit_circuitpython_gps-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: adafruit-circuitpython-gps
-Version: 3.11.10
+Version: 4.0.0
 Summary: CircuitPython library for GPS modules.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License-Expression: MIT

{adafruit_circuitpython_gps-3.11.10 → adafruit_circuitpython_gps-4.0.0}/adafruit_circuitpython_gps.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: adafruit-circuitpython-gps
-Version: 3.11.10
+Version: 4.0.0
 Summary: CircuitPython library for GPS modules.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License-Expression: MIT

{adafruit_circuitpython_gps-3.11.10 → adafruit_circuitpython_gps-4.0.0}/adafruit_gps.py

@@ -40,7 +40,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "3.11.10"
+__version__ = "4.0.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_GPS.git"
 
 
@@ -315,9 +315,14 @@ class GPS:
             |    3 - 3D fix
         """
         self.satellites = None
-        """The number of satellites in use, 0 - 12"""
+        """The number of satellites in use (GGA), 0 - 12"""
         self.satellites_prev = None
         """The number of satellites in use from the previous data point, 0 - 12"""
+        self.satellites_in_view = None
+        """The number of satellites in view (GSV), 0 - 12"""
+        self.satellites_in_view_prev = None
+        """The number of satellites in view from the previous data point, 0 - 12"""
+
         self.horizontal_dilution = None
         """Horizontal dilution of precision (GGA)"""
         self.altitude_m = None
@@ -678,6 +683,9 @@ class GPS:
         # GPS quality indicator
         self.fix_quality = parsed_data[5]
 
+        # Capture previous value
+        self.satellites_prev = self.satellites
+
         # Number of satellites in use, 0 - 12
         self.satellites = parsed_data[6]
 
@@ -754,8 +762,12 @@ class GPS:
         self.total_mess_num = data[0]
         # Message number
         self.mess_num = data[1]
+
+        # Capture previous value
+        self.satellites_in_view_prev = self.satellites_in_view
+
         # Number of satellites in view
-        self.satellites = data[2]
+        self.satellites_in_view = data[2]
 
         sat_tup = data[3:]
 
@@ -784,7 +796,7 @@ class GPS:
 
         if self.mess_num == self.total_mess_num:
             # Last part of GSV message
-            if len(self._sats) == self.satellites:
+            if len(self._sats) == self.satellites_in_view:
                 # Transfer received satellites to self.sats
                 if self.sats is None:
                     self.sats = {}
@@ -802,8 +814,6 @@ class GPS:
                     self.sats[sat[0]] = sat
             self._sats.clear()
 
-        self.satellites_prev = self.satellites
-
         return True
 
 

{adafruit_circuitpython_gps-3.11.10 → adafruit_circuitpython_gps-4.0.0}/pyproject.toml

@@ -12,7 +12,7 @@ requires = [
 [project]
 name = "adafruit-circuitpython-gps"
 description = "CircuitPython library for GPS modules."
-version = "3.11.10"
+version = "4.0.0"
 readme = "README.rst"
 authors = [
     {name = "Adafruit Industries", email = "circuitpython@adafruit.com"}

{adafruit_circuitpython_gps-3.11.10 → adafruit_circuitpython_gps-4.0.0}/tests/adafruit_gps_test.py

@@ -421,7 +421,7 @@ def test_GPS_update_from_GSV_first_part():
         assert gps.update()
         assert gps.total_mess_num == 2
         assert gps.mess_num == 1
-        assert gps.satellites == 8
+        assert gps.satellites_in_view == 8
         # check two satellites, without timestamp, since it is dynamic
         sats = gps._sats
         assert sats[0][:-1] == ("GP1", 40, 83, 46)
@@ -449,7 +449,7 @@ def test_GPS_update_from_GSV_both_parts_sats_are_removed():
             assert gps.update()
             assert gps.total_mess_num == 2
             assert gps.mess_num == 1
-            assert gps.satellites == 4
+            assert gps.satellites_in_view == 4
             # first time we received satellites, so this must be None
             assert gps.sats is None
         # some time has passed so the first two satellites will be too old, but
@@ -460,7 +460,7 @@ def test_GPS_update_from_GSV_both_parts_sats_are_removed():
             assert gps.update()
             assert gps.total_mess_num == 2
             assert gps.mess_num == 2
-            assert gps.satellites == 4
+            assert gps.satellites_in_view == 4
             # we should now have 4 satellites from the two part request
             assert set(gps.sats.keys()) == {"GP1", "GP2", "GP12", "GP14"}
 
@@ -470,7 +470,7 @@ def test_GPS_update_from_GSV_both_parts_sats_are_removed():
             # a third, one part request
             m.return_value = b"$GPGSV,1,1,02,13,07,344,39,15,22,228,45*7a\r\n"
             assert gps.update()
-            assert gps.satellites == 2
+            assert gps.satellites_in_view == 2
             assert set(gps.sats.keys()) == {"GP12", "GP14", "GP13", "GP15"}