execute_trigger forces a software trigger in all modes (#195)

closes #194 depends on acquire-project/acquire-common#34 Changes the `execute_trigger` behavior to force a software trigger when called regardless of the camera configuration. This helps with `acquire_abort()`. Interestingly, we seem to already have an `abort-finite-acquisition` test. I wonder if it can be improved to cover the problem Micah ran into. May need to just add a check that the everything is restartable after the abort. --------- Co-authored-by: Alan Liddell <[email protected]>
acquire-project · Jan 19, 2024 · bb80ec8 · bb80ec8
1 parent 5119333
commit bb80ec8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/acquire-common b/acquire-common
diff --git a/src/dcam.camera.c b/src/dcam.camera.c
@@ -888,7 +888,28 @@ enum DeviceStatusCode
 aq_dcam_fire_software_trigger(struct Camera* self_)
 {
     struct Dcam4Camera* self = containerof(self_, struct Dcam4Camera, camera);
+
+    const HDCAM h = self->hdcam;
+    int trigger_source;
+    DCAM(prop_read(i32, h, DCAM_IDPROP_TRIGGERSOURCE, &trigger_source));
+
+    if (trigger_source != DCAMPROP_TRIGGERSOURCE__SOFTWARE) {
+
+        // Force a software trigger by temporarily disabling external
+        // triggering, firing a software trigger, and re-enabling the
+        // external trigger.
+
+        DCAM(dcamprop_setvalue(
+          h, DCAM_IDPROP_TRIGGERSOURCE, DCAMPROP_TRIGGERSOURCE__SOFTWARE));
+    }
+
     DCAM(dcamcap_firetrigger(self->hdcam, 0));
+
+    if (trigger_source != DCAMPROP_TRIGGERSOURCE__SOFTWARE) {
+        // restore
+        DCAM(dcamprop_setvalue(h, DCAM_IDPROP_TRIGGERSOURCE, trigger_source));
+    }
+
     return Device_Ok;
 Error:
     return Device_Err;

diff --git a/tests/abort-finite-acquisition.cpp b/tests/abort-finite-acquisition.cpp
@@ -89,7 +89,8 @@ main()
         };
         props.video[0].camera.settings.exposure_time_us = 1e4;
         props.video[0].max_frame_count = 10;
-        props.video[0].camera.settings.input_triggers.frame_start.line = 0;
+        props.video[0].camera.settings.input_triggers.frame_start.line =
+          0; // Ext. Trig
         props.video[0].camera.settings.input_triggers.frame_start.enable = 1;
 
         OK(acquire_configure(runtime, &props));
+1 −0		CHANGELOG.md
+1 −0		acquire-core-libs/src/acquire-device-hal/device/hal/camera.c
+1 −1		acquire-core-libs/src/acquire-device-kit/device/kit/camera.h
+2 −1		acquire-video-runtime/src/acquire.c