From b4f54d5d999e9f36b20f58673352e1240b6ce6b5 Mon Sep 17 00:00:00 2001 From: Chris Esposito Date: Fri, 15 Feb 2019 21:03:02 +1100 Subject: [PATCH] trigger CH2 works --- Desktop_Interface/isodriver.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Desktop_Interface/isodriver.cpp b/Desktop_Interface/isodriver.cpp index 361a65c1..f980bced 100644 --- a/Desktop_Interface/isodriver.cpp +++ b/Desktop_Interface/isodriver.cpp @@ -685,10 +685,9 @@ void isoDriver::frameActionGeneric(char CH1_mode, char CH2_mode) //0 for off, 1 //qDebug() << "Now offset = " << offset; } - // Fixme: Won't work with CH2 double triggerDelay = 0; if (triggerEnabled) - triggerDelay = internalBuffer375_CH1->getDelayedTriggerPoint(window) - window; + triggerDelay = (triggerMode < 2) ? internalBuffer375_CH1->getDelayedTriggerPoint(window) - window : internalBuffer375_CH2->getDelayedTriggerPoint(window) - window; if(singleShotEnabled && (triggerDelay != 0)) singleShotTriggered(1);