From e6a39d2dc94994dc91b9d36886c59601490c561b Mon Sep 17 00:00:00 2001 From: Robert Tuck Date: Mon, 29 Apr 2024 10:49:17 +0100 Subject: [PATCH] (DiamondLightSource/dodal#446) Remove dodal implementation of epics_signal_rw_rbv() in favour of the one in ophyd-async --- src/dodal/devices/robot.py | 2 +- src/dodal/devices/util/epics_util.py | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/dodal/devices/robot.py b/src/dodal/devices/robot.py index 3fd436ce99..7339ceed3c 100644 --- a/src/dodal/devices/robot.py +++ b/src/dodal/devices/robot.py @@ -7,8 +7,8 @@ from bluesky.protocols import Descriptor, Movable, Reading from ophyd_async.core import AsyncStatus, StandardReadable, wait_for_value from ophyd_async.epics.signal import epics_signal_r, epics_signal_x +from ophyd_async.epics.signal.signal import epics_signal_rw_rbv -from dodal.devices.util.epics_util import epics_signal_rw_rbv from dodal.log import LOGGER diff --git a/src/dodal/devices/util/epics_util.py b/src/dodal/devices/util/epics_util.py index 0af3a88b21..083460b9fd 100644 --- a/src/dodal/devices/util/epics_util.py +++ b/src/dodal/devices/util/epics_util.py @@ -3,7 +3,6 @@ from ophyd import Component, Device, EpicsSignal from ophyd.status import Status, StatusBase -from ophyd_async.epics.signal import epics_signal_rw from dodal.devices.status import await_value from dodal.log import LOGGER @@ -126,9 +125,3 @@ def set(self, proc: int) -> Status: lambda: self.proc.set(proc), ] ) - - -def epics_signal_rw_rbv( - T, write_pv: str -): # Remove when https://github.com/bluesky/ophyd-async/issues/139 is done - return epics_signal_rw(T, write_pv + "_RBV", write_pv)