pyobs-zaber 2.0.0.dev1__tar.gz → 2.0.0.dev2__tar.gz

{pyobs_zaber-2.0.0.dev1 → pyobs_zaber-2.0.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobs-zaber
-Version: 2.0.0.dev1
+Version: 2.0.0.dev2
 Summary: pyobs model for Zaber motors
 Author-email: Leon Meerwart <leon.meerwart@uni-goettingen.de>
 License-Expression: MIT

{pyobs_zaber-2.0.0.dev1 → pyobs_zaber-2.0.0.dev2}/pyobs_zaber/zabermodeselector.py

@@ -1,7 +1,8 @@
 import logging
 from typing import Any
 
-from pyobs.interfaces import IMode, IMotion, IReady, MotionState, ReadyState
+from pyobs.events import ModeChangedEvent
+from pyobs.interfaces import IMode, IMotion, IReady, ModeCapabilities, ModeState, MotionState, ReadyState
 from pyobs.modules import Module
 from pyobs.utils.enums import MotionStatus
 
@@ -9,6 +10,8 @@ from pyobs_zaber.zaberdriver import ZaberDriver
 
 log = logging.getLogger(__name__)
 
+_GROUP = "Mode"
+
 
 class ZaberModeSelector(Module, IMode, IMotion):
     """Class for the Selection of Modus with a linear Motor (e.g. Spectroscopy or Photometry)."""
@@ -34,13 +37,15 @@ class ZaberModeSelector(Module, IMode, IMotion):
         """Open module."""
         await Module.open(self)
         await self.driver.open()
+
+        if self._comm:
+            await self.comm.register_event(ModeChangedEvent)
+
+        await self.comm.set_capabilities(IMode, ModeCapabilities(modes={_GROUP: list(self.modes.keys())}))
+        await self.comm.set_state(IMode, ModeState(modes={_GROUP: self.current_mode}))
         await self.comm.set_state(IReady, ReadyState(ready=True))
         await self.comm.set_state(IMotion, MotionState(status=MotionStatus.PARKED))
 
-    async def list_modes(self, group: int = 0, **kwargs: Any) -> list[str]:
-        """List available modes."""
-        return list(self.modes.keys())
-
     async def set_mode(self, mode: str, group: int = 0, **kwargs: Any) -> None:
         """Set the current mode.
 
@@ -63,12 +68,10 @@ class ZaberModeSelector(Module, IMode, IMotion):
         await self.driver.move_to(self.modes[mode])
         self.current_mode = mode
         await self.comm.set_state(IMotion, MotionState(status=MotionStatus.POSITIONED))
+        await self.comm.send_event(ModeChangedEvent(_GROUP, mode))
+        await self.comm.set_state(IMode, ModeState(modes={_GROUP: self.current_mode}))
         log.info("Mode %s ready.", mode)
 
-    async def get_mode(self, group: int = 0, **kwargs: Any) -> str:
-        """Get currently set mode."""
-        return self.current_mode
-
     async def init(self, **kwargs: Any) -> None:
         """Initialize device."""
         await self.comm.set_state(IMotion, MotionState(status=MotionStatus.INITIALIZING))

{pyobs_zaber-2.0.0.dev1 → pyobs_zaber-2.0.0.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyobs-zaber"
-version = "2.0.0.dev1"
+version = "2.0.0.dev2"
 description = "pyobs model for Zaber motors"
 authors = [{ name = "Leon Meerwart", email = "leon.meerwart@uni-goettingen.de" }]
 requires-python = ">=3.11"

{pyobs_zaber-2.0.0.dev1 → pyobs_zaber-2.0.0.dev2}/uv.lock

@@ -1766,7 +1766,7 @@ wheels = [
 
 [[package]]
 name = "pyobs-zaber"
-version = "2.0.0.dev1"
+version = "2.0.0.dev2"
 source = { editable = "." }
 dependencies = [
     { name = "pyobs-core" },