Skip to content

Commit 5a84d92

Browse files
fix: Prevent timeout in stop_busy_record (#972)
1 parent ec5cfa5 commit 5a84d92

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/ophyd_async/epics/adcore/_core_logic.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ async def wait_for_idle(self):
6565
async def disarm(self):
6666
# We can't use caput callback as we already used it in arm() and we can't have
6767
# 2 or they will deadlock
68-
await stop_busy_record(self.driver.acquire, False, timeout=1)
68+
await stop_busy_record(self.driver.acquire, False)
6969

7070
async def set_exposure_time_and_acquire_period_if_supplied(
7171
self,
@@ -218,7 +218,7 @@ async def arm(self) -> None:
218218
await self.cb_plugin.trigger.set(True, wait=False)
219219

220220
async def disarm(self) -> None:
221-
await stop_busy_record(self.cb_plugin.capture, False, timeout=1)
221+
await stop_busy_record(self.cb_plugin.capture, False)
222222
if self._arm_status and not self._arm_status.done:
223223
await self._arm_status
224224
self._arm_status = None

src/ophyd_async/epics/adcore/_utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ async def stop_busy_record(
140140
signal: SignalRW[SignalDatatypeT],
141141
value: SignalDatatypeT,
142142
timeout: float = DEFAULT_TIMEOUT,
143-
status_timeout: float | None = None,
144143
) -> None:
145-
await signal.set(value, wait=False, timeout=status_timeout)
144+
await signal.set(value, wait=False)
146145
await wait_for_value(signal, value, timeout=timeout)

0 commit comments

Comments
 (0)