Added pulldata option to allow cockpit to pull data from valuelogger devices

Author: iandobbie

microscope/abc.py

@@ -1696,13 +1696,17 @@ class ValueLogger(DataDevice, metaclass=abc.ABCMeta):
         numSensors: total number of measurements.
 
     """
-    def __init__(self, numSensors: int, **kwargs) -> None:
+
+    def __init__(self, numSensors: int, pullData: bool, **kwargs) -> None:
         super().__init__(**kwargs)
         if numSensors < 1:
             raise ValueError(
                 "NumSensors must be a positive number (was %d)" % numSensors
             )
         self._numSensors = numSensors
+        #if pull data is True data will be pulled from the server if False
+        # data will be pushed from microsocpe (default)
+        self.pullData = pullData
 
     @abc.abstractmethod
     def initialize(self):
@@ -1712,3 +1716,8 @@ def initialize(self):
     def get_num_sensors(self):
         """Returns the number of sensors lines present in this instance."""
         return self._numSensors
+
+    @abc.abstractmethod
+    def getValues(self):
+        """Returns values from all sensors"""
+        raise NotImplementedError()

microscope/simulators/__init__.py

@@ -551,18 +551,21 @@ def initialize(self):
     # functions required as we are DataDevice returning data to the server.
     def _fetch_data(self):
         if (time.time() - self.lastDataTime) > 5.0:
-            for i in range(self._numSensors):
-                self._cache[i] = (
-                    19.5
-                    + i
-                    + 5 * math.sin(self.lastDataTime / 100)
-                    + random.random()
-                )
-                _logger.debug("Sensors %d returns %s" % (i, self._cache[i]))
             self.lastDataTime = time.time()
-            return self._cache
+            return self.getValues()
         return None
 
+    def getValues(self):
+        for i in range(self._numSensors):
+            self._cache[i] = (
+                19.5
+                + i
+                + 5 * math.sin(self.lastDataTime / 100)
+                + random.random()
+            )
+            _logger.debug("Sensors %d returns %s" % (i, self._cache[i]))
+        return self._cache
+
     def abort(self):
         pass