mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trigger CH2 works

This commit is contained in:
Chris Esposito 2019-02-15 21:03:02 +11:00
parent 68512ebe95
commit b4f54d5d99
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Desktop_Interface/isodriver.cpp
View File

@ -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);