pass sigan for gps through method calls instead of constructor

scos_actions/actions/sync_gps.py

@@ -19,12 +19,12 @@ def __init__(self, parameters: dict):
     def __call__(self, sensor: Sensor, schedule_entry: dict, task_id: int):
         logger.debug("Syncing to GPS")
         self.sensor = sensor
-        dt = self.sensor.gps.get_gps_time()
+        dt = self.sensor.gps.get_gps_time(self.sensor.signal_analyzer)
         date_cmd = ["date", "-s", "{:}".format(dt.strftime("%Y/%m/%d %H:%M:%S"))]
         subprocess.check_output(date_cmd, shell=True)
         logger.info(f"Set system time to GPS time {dt.ctime()}")
 
-        location = sensor.gps.get_location()
+        location = sensor.gps.get_location(self.sensor.signal_analyzer)
         if location is None:
             raise RuntimeError("Unable to synchronize to GPS")
 

scos_actions/discover/tests/test_yaml.py

@@ -25,7 +25,7 @@
 """
 
 sigan = MockSignalAnalyzer()
-gps = MockGPS(sigan)
+gps = MockGPS()
 
 
 def test_load_from_yaml_existing():

scos_actions/hardware/gps_iface.py

@@ -3,9 +3,9 @@
 
 class GPSInterface(ABC):
     @abstractmethod
-    def get_location(self, timeout_s=1):
+    def get_location(self, sigan, timeout_s=1):
         pass
 
     @abstractmethod
-    def get_gps_time(self):
+    def get_gps_time(self, sigan):
         pass

scos_actions/hardware/mocks/mock_gps.py

@@ -7,13 +7,11 @@
 
 
 class MockGPS(GPSInterface):
-    def __init__(self, sigan):
-        self.sigan = sigan
 
-    def get_location(timeout_s=1):
+    def get_location(self, sigan, timeout_s=1):
         logger.warning("Using mock GPS!")
         return 39.995118, -105.261572, 1651.0
 
-    def get_gps_time(self):
+    def get_gps_time(self, sigan):
         logger.warning("Using mock GPS!")
         return datetime.now()

scos_actions/hardware/tests/test_sensor.py

@@ -23,7 +23,7 @@ def test_set_get_preselector():
 
 def test_set_get_gps():
     sigan = MockSignalAnalyzer()
-    gps = MockGPS(sigan)
+    gps = MockGPS()
     sensor = Sensor(signal_analyzer=sigan, capabilities={})
     sensor.gps = gps
     assert sensor.gps == gps