Replaced wait_for_idle in the demo motor with an AsyncStatus wrapped …

…call to wait_for_value

src/ophyd_async/tango/demo/_mover.py

@@ -1,7 +1,7 @@
 import asyncio
 from typing import Optional
 
-from bluesky.protocols import Movable, Reading, Stoppable
+from bluesky.protocols import Movable, Stoppable
 
 from ophyd_async.core import (
     DEFAULT_TIMEOUT,
@@ -15,6 +15,7 @@
     WatchableAsyncStatus,
     WatcherUpdate,
     observe_value,
+    wait_for_value,
 )
 from ophyd_async.tango import TangoReadable, tango_polling
 from tango import DevState
@@ -48,8 +49,9 @@ async def set(self, value: float, timeout: CalculatableTimeout = CalculateTimeou
         # For this server, set returns immediately so this status should not be awaited
         await self.position.set(value, wait=False, timeout=timeout)
 
-        # Wait for the motor to stop
-        move_status = self.wait_for_idle()
+        move_status = AsyncStatus(
+            wait_for_value(self.state, DevState.ON, timeout=timeout)
+        )
 
         try:
             async for current_position in observe_value(
@@ -67,18 +69,6 @@ async def set(self, value: float, timeout: CalculatableTimeout = CalculateTimeou
         if not self._set_success:
             raise RuntimeError("Motor was stopped")
 
-    @AsyncStatus.wrap
-    async def wait_for_idle(self):
-        event = asyncio.Event()
-
-        def _wait(value: dict[str, Reading]):
-            if value[self.state.name]["value"] == DevState.ON:
-                event.set()
-
-        self.state.subscribe(_wait)
-        await event.wait()
-        self.state.clear_sub(_wait)
-
     def stop(self, success: bool = True) -> AsyncStatus:
         self._set_success = success
         return self._stop.trigger()