XRF viewer display to work with new ophyd-async Xspress device

src/conftest.py

@@ -16,6 +16,7 @@
 
 import haven
 from haven.catalog import Catalog
+from haven.devices import Xspress3Detector
 from haven.devices.aps import ApsMachine
 from haven.devices.area_detector import AravisDetector
 from haven.devices.beamline_manager import BeamlineManager, IOCManager
@@ -27,8 +28,6 @@
 from haven.devices.shutter import PssShutter
 from haven.devices.slits import ApertureSlits, BladeSlits
 from haven.devices.xia_pfcu import PFCUFilter, PFCUFilterBank, PFCUShutter
-from haven.devices.xspress import Xspress3Detector
-from haven.devices.xspress import add_mcas as add_xspress_mcas
 
 top_dir = Path(__file__).parent.resolve()
 haven_dir = top_dir / "haven"
@@ -159,19 +158,10 @@ def dxp(sim_registry):
     yield vortex
 
 
-class Xspress3Vortex(Xspress3Detector):
-    mcas = DCpt(
-        add_xspress_mcas(range_=[0, 1, 2, 3]),
-        kind=Kind.normal | Kind.hinted,
-        default_read_attrs=[f"mca{i}" for i in [0, 1, 2, 3]],
-        default_configuration_attrs=[f"mca{i}" for i in [0, 1, 2, 3]],
-    )
-
-
 @pytest.fixture()
-def xspress(sim_registry):
-    FakeXspress = make_fake_device(Xspress3Vortex)
-    vortex = FakeXspress(name="vortex_me4", labels={"xrf_detectors"})
+async def xspress(sim_registry):
+    vortex = Xspress3Detector(name="vortex_me4", prefix="255id_vortex:", elements=4)
+    await vortex.connect(mock=True)
     sim_registry.register(vortex)
     yield vortex
 

src/firefly/pydm_plugin.py

@@ -75,7 +75,7 @@ def add_listener(self, channel):
         super().add_listener(channel)
         # If the channel is used for writing to PVs, hook it up to the 'put' methods.
         if channel.value_signal is not None:
-            for type_ in [str, int, float, np.ndarray]:
+            for type_ in [str, int, float, bool, np.ndarray]:
                 try:
                     channel.value_signal[type_].connect(self.put_value)
                 except KeyError:
@@ -140,6 +140,7 @@ def close(self):
     @asyncSlot(int)
     @asyncSlot(float)
     @asyncSlot(str)
+    @asyncSlot(bool)
     @asyncSlot(np.ndarray)
     async def put_value(self, new_value):
         if self.is_triggerable:
@@ -172,5 +173,5 @@ def connection_class(channel, address, protocol):
         elif is_vanilla_ophyd:
             return HavenConnection(channel, address, protocol)
         else:
-            msg = f"Signal must be ophyd or ophyd_async signal. Got {type(sig)}."
+            msg = f"Signal for {address=} must be ophyd or ophyd_async signal. Got {type(sig)=}."
             raise UnknownOphydSignal(msg)