From 3e6876797af815ab93a5ccf8a1a745fe489cec9c Mon Sep 17 00:00:00 2001 From: Ollie Copping Date: Fri, 17 Mar 2023 10:32:03 +0000 Subject: [PATCH] Fix shutter position consts and logic for setting shutter pos --- src/pmacfiltercontrol/pmacFilterControlWrapper.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pmacfiltercontrol/pmacFilterControlWrapper.py b/src/pmacfiltercontrol/pmacFilterControlWrapper.py index c7c6436..7549a47 100644 --- a/src/pmacfiltercontrol/pmacFilterControlWrapper.py +++ b/src/pmacfiltercontrol/pmacFilterControlWrapper.py @@ -49,8 +49,8 @@ 15, ] -SHUTTER_CLOSED = "CLOSED" -SHUTTER_OPEN = "OPEN" +SHUTTER_CLOSED = 0 +SHUTTER_OPEN = 1 def _if_connected(func: Callable) -> Callable: @@ -851,7 +851,7 @@ async def _set_shutter(self, shutter_state: int) -> None: await caput(f"{self.motors}:SHUTTER", pos, wait=False, throw=False) - def _set_shutter_pos(self, val: float, shutter_state: str) -> None: + def _set_shutter_pos(self, val: float, shutter_state: int) -> None: """ Set the shutter position count value. @@ -862,7 +862,9 @@ def _set_shutter_pos(self, val: float, shutter_state: str) -> None: if shutter_state == SHUTTER_CLOSED: self._configure_param({"shutter_closed_position": val}) - current_shutter_state = "CLOSED" if self.shutter.get() == 0 else "OPEN" + current_shutter_state = ( + SHUTTER_CLOSED if self.shutter.get() == 0 else SHUTTER_OPEN + ) if current_shutter_state == shutter_state: self._set_shutter(shutter_state)