Merge pull request bluesky#1219 from bluesky/1218-use-the-value-of-tr…

…igger_value

use provided value of trigger_value

ophyd/device.py

@@ -1457,7 +1457,8 @@ def done_acquisition(**ignored_kwargs):
             # has finished
             self._done_acquiring()
 
-        acq_signal.put(1, wait=False, callback=done_acquisition)
+        trigger_value = self._sig_attrs[acq_signal.attr_name].trigger_value
+        acq_signal.put(trigger_value, wait=False, callback=done_acquisition)
         return status
 
     def stop(self, *, success=False):

ophyd/tests/test_device.py

@@ -944,3 +944,28 @@ class MyDevice(Device):
     assert MyDevice.cpt3._get_class_from_annotation() is SignalRO
     assert MyDevice.cpt3.cls is SignalRO
     assert MyDevice.cpt4._get_class_from_annotation() is None
+
+
+@pytest.mark.parametrize(
+    "initial, after",
+    [
+        [False, True],
+        [0, 1],
+        ["", "1!"],
+    ],
+)
+def test_trigger_value(initial, after):
+    """Ensure the configured trigger_value is used."""
+
+    class FakeTriggerableDevice(Device):
+        """Common trigger signals expect value=1"""
+
+        strigger = Component(Signal, value=initial, trigger_value=after)
+
+    d = FakeTriggerableDevice("", name="test")
+    assert len(d.trigger_signals) == 1
+    assert [d.strigger] == d.trigger_signals
+    assert d.strigger.get() == initial
+
+    d.trigger()
+    assert d.strigger.get() == after