Skip to content

Commit

Permalink
Merge pull request #479 from DiamondLightSource/446_use_ophyd_async_r…
Browse files Browse the repository at this point in the history
…bv_helper

446 use ophyd async rbv helper instead of our own implementation
  • Loading branch information
DominicOram authored Apr 29, 2024
2 parents 8428933 + e6a39d2 commit dda88fd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion src/dodal/devices/robot.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
7 changes: 0 additions & 7 deletions src/dodal/devices/util/epics_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

0 comments on commit dda88fd

Please sign in to comment.