Fix ADOdin writer.open() for dodal plan

src/ophyd_async/epics/eiger/_odin_io.py

@@ -14,7 +14,6 @@
     SignalR,
     StrictEnum,
     observe_value,
-    set_and_wait_for_other_value,
     set_and_wait_for_value,
     wait_for_value,
 )
@@ -53,7 +52,7 @@ def __init__(self, prefix: str, name: str = "") -> None:
 
         self.capture = epics_signal_rw(Writing, f"{prefix}Capture")
         self.capture_rbv = epics_signal_r(str, prefix + "Capture_RBV")
-        self.num_captured = epics_signal_r(int, f"{prefix}NumCapture_RBV")
+        self.num_captured = epics_signal_r(int, f"{prefix}NumCaptured_RBV")
         self.num_to_capture = epics_signal_rw_rbv(int, f"{prefix}NumCapture")
 
         self.start_timeout = epics_signal_rw(str, f"{prefix}StartTimeout")
@@ -102,16 +101,14 @@ async def open(self, name: str, exposures_per_event: int = 1) -> dict[str, DataK
 
         await wait_for_value(self._drv.meta_active, "Active", timeout=DEFAULT_TIMEOUT)
 
-        await set_and_wait_for_other_value(
-            self._drv.capture,
-            Writing.CAPTURE,
-            self._drv.capture_rbv,
-            "Capturing",
-            set_timeout=None,
-            wait_for_set_completion=False,
+        await self._drv.capture.set(
+            Writing.CAPTURE, wait=False
         )  # TODO: Investigate why we do not get a put callback when setting capture pv https://github.com/bluesky/ophyd-async/issues/866
 
-        await wait_for_value(self._drv.meta_writing, "Writing", timeout=DEFAULT_TIMEOUT)
+        await asyncio.gather(
+            wait_for_value(self._drv.capture_rbv, "Capturing", timeout=DEFAULT_TIMEOUT),
+            wait_for_value(self._drv.meta_writing, "Writing", timeout=DEFAULT_TIMEOUT),
+        )
 
         return await self._describe()
 

src/ophyd_async/fastcs/eiger/_eiger_io.py

@@ -39,6 +39,7 @@ class EigerDetectorIO(Device):
     omega_increment: SignalRW[float]
     arm: SignalX
     disarm: SignalX
+    trigger: SignalX
 
 
 class EigerDriverIO(Device):

tests/epics/eiger/test_odin_io.py

@@ -88,31 +88,24 @@ async def test_when_closed_then_data_capture_turned_off(
 
 @pytest.mark.asyncio
 @patch("ophyd_async.epics.eiger._odin_io.wait_for_value")
-@patch("ophyd_async.epics.eiger._odin_io.set_and_wait_for_other_value")
 async def test_wait_for_active_before_capture_then_wait_for_writing(
-    mock_set_and_wait_for_other_value,
     mock_wait_for_value,
     odin_driver_and_writer,
 ):
     driver, writer = odin_driver_and_writer
+    writer._drv.capture.set = AsyncMock()
 
     mock_manager = AsyncMock()
     mock_manager.attach_mock(mock_wait_for_value, "mock_wait_for_value")
-    mock_manager.attach_mock(
-        mock_set_and_wait_for_other_value, "mock_set_and_wait_for_other_value"
-    )
+    mock_manager.attach_mock(writer._drv.capture.set, "mock_capture_set")
 
     await writer.open(ODIN_DETECTOR_NAME)
 
     expected_calls = [
         call.mock_wait_for_value(driver.meta_active, "Active", timeout=DEFAULT_TIMEOUT),
-        call.mock_set_and_wait_for_other_value(
-            driver.capture,
-            Writing.CAPTURE,
-            driver.capture_rbv,
-            "Capturing",
-            set_timeout=None,
-            wait_for_set_completion=False,
+        call.mock_capture_set(Writing.CAPTURE, wait=False),
+        call.mock_wait_for_value(
+            driver.capture_rbv, "Capturing", timeout=DEFAULT_TIMEOUT
         ),
         call.mock_wait_for_value(
             driver.meta_writing, "Writing", timeout=DEFAULT_TIMEOUT