Reset state on ti filters and objective wheels if they're in an invalid state.

Author: k-rl

src/prismo/devices/ti.py

@@ -32,10 +32,14 @@ def wait(self):
 
     @property
     def state(self) -> int | str:
-        if isinstance(self.states[0], int):
-            return self._core.getState(self.name)
-        else:
-            return self._core.getStateLabel(self.name)
+        try:
+            if isinstance(self.states[0], int):
+                return self._core.getState(self.name)
+            else:
+                return self._core.getStateLabel(self.name)
+        except Exception:
+            self.state = self.states[0]
+            return self.states[0]
 
     @state.setter
     def state(self, new_state: int | str):
@@ -116,10 +120,14 @@ def wait(self):
 
     @property
     def state(self) -> int | str:
-        if isinstance(self.states[0], int):
-            return self._core.getState(self.name)
-        else:
-            return self._core.getStateLabel(self.name)
+        try:
+            if isinstance(self.states[0], int):
+                return self._core.getState(self.name)
+            else:
+                return self._core.getStateLabel(self.name)
+        except Exception:
+            self.state = self.states[0]
+            return self.states[0]
 
     @state.setter
     def state(self, new_state: int | str):

src/prismo/devices/ti2.py

@@ -34,10 +34,14 @@ def wait(self):
 
     @property
     def state(self) -> int | str:
-        if isinstance(self.states[0], int):
-            return self._core.getState(self.name)
-        else:
-            return self._core.getStateLabel(self.name)
+        try:
+            if isinstance(self.states[0], int):
+                return self._core.getState(self.name)
+            else:
+                return self._core.getStateLabel(self.name)
+        except Exception:
+            self.state = self.states[0]
+            return self.states[0]
 
     @state.setter
     def state(self, new_state: int | str):
@@ -119,10 +123,14 @@ def wait(self):
 
     @property
     def state(self) -> int | str:
-        if isinstance(self.states[0], int):
-            return self._core.getState(self.name)
-        else:
-            return self._core.getStateLabel(self.name)
+        try:
+            if isinstance(self.states[0], int):
+                return self._core.getState(self.name)
+            else:
+                return self._core.getStateLabel(self.name)
+        except Exception:
+            self.state = self.states[0]
+            return self.states[0]
 
     @state.setter
     def state(self, new_state: int | str):

src/prismo/widgets.py

@@ -211,7 +211,7 @@ def __init__(self, relay: "Relay"):
         layout = QVBoxLayout(self)
         self._timer = QTimer()
         self._timer.timeout.connect(self.update_states)
-        self._timer.start(100)
+        self._timer.start(10)
 
         for name, state in self._states.items():
             row = QHBoxLayout()
@@ -268,11 +268,11 @@ def __init__(self, relay: "Relay"):
         self._valve_states: dict[str, list[str | int]] = self._relay.get("valve_states")
         self._valve_widgets: dict[str, QPushButton | QComboBox] = {}
         self._btns: list[QPushButton] = []
-        self.setMaximumHeight(150)
+        self.setMaximumHeight(300)
         outer = QVBoxLayout(self)
         self._timer = QTimer()
         self._timer.timeout.connect(self.update_valves)
-        self._timer.start(100)
+        self._timer.start(10)
 
         self._btn_grid = QGridLayout()
         self._btn_grid.setHorizontalSpacing(0)