Duplicate nonblocking AD functionality from nslsii package

Author: callumforrester

pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
 ]
 description = "Ophyd devices and other utils that could be used across DLS beamlines"
-dependencies = ["ophyd", "bluesky", "pyepics", "pydantic", "nslsii"]
+dependencies = ["ophyd", "bluesky", "pyepics", "pydantic"]
 dynamic = ["version"]
 license.file = "LICENSE"
 readme = "README.rst"

src/dodal/devices/areadetector/adutils.py

@@ -1,21 +1,35 @@
-from nslsii.ad33 import CamV33Mixin
+from ophyd import Component as Cpt
+from ophyd import EpicsSignal, EpicsSignalRO
 from ophyd.areadetector.cam import AreaDetectorCam
 from ophyd.areadetector.filestore_mixins import FileStoreHDF5, FileStoreIterativeWrite
 from ophyd.areadetector.plugins import HDF5Plugin
 
 
-class SynchronisedAdDriverBase(AreaDetectorCam, CamV33Mixin):
+class SynchronisedAdDriverBase(AreaDetectorCam):
     """
     Base Ophyd device to control an AreaDetector driver and
     syncrhonise it on other AreaDetector plugins, even non-blocking ones.
     """
 
+    adcore_version = Cpt(EpicsSignalRO, "ADCoreVersion_RBV", string=True, kind="config")
+    driver_version = Cpt(EpicsSignalRO, "DriverVersion_RBV", string=True, kind="config")
+    wait_for_plugins = Cpt(EpicsSignal, "WaitForPlugins", string=True, kind="config")
+
     def stage(self, *args, **kwargs):
         # Makes the detector allow non-blocking AD plugins but makes Ophyd use
         # the AcquireBusy PV to determine when an acquisition is complete
         self.ensure_nonblocking()
         return super().stage(*args, **kwargs)
 
+    def ensure_nonblocking(self):
+        self.stage_sigs["wait_for_plugins"] = "Yes"
+        for c in self.parent.component_names:
+            cpt = getattr(self.parent, c)
+            if cpt is self:
+                continue
+            if hasattr(cpt, "ensure_nonblocking"):
+                cpt.ensure_nonblocking()
+
 
 class Hdf5Writer(HDF5Plugin, FileStoreHDF5, FileStoreIterativeWrite):
     """ """