Renamed devices to components

openflexure_microscope/stage/base.py

@@ -49,6 +49,14 @@ class BaseStage(metaclass=ABCMeta):
         """The current position, as a list"""
         pass
 
+    @property
+    def position_map(self):
+        return {
+            "x": self.position[0],
+            "y": self.position[1],
+            "z": self.position[2],
+        }
+
     @property
     @abstractmethod
     def backlash(self):

openflexure_microscope/stage/mock.py

@@ -20,13 +20,10 @@ class MockStage(BaseStage):
     def status(self):
         """The general status dictionary of the board."""
         status = {
-            "position": {
-                "x": self.position[0],
-                "y": self.position[1],
-                "z": self.position[2],
-            },
+            "position": self.position_map,
             "board": None,
-            "version": "0",
+            "firmware": None,
+            "version": None
         }
         return status
 

openflexure_microscope/stage/sanga.py

@@ -34,11 +34,7 @@ class SangaStage(BaseStage):
     def status(self):
         """The general status dictionary of the board."""
         status = {
-            "position": {
-                "x": self.position[0],
-                "y": self.position[1],
-                "z": self.position[2],
-            },
+            "position": self.position_map,
             "board": self.board.board,
             "firmware": self.board.firmware,
         }