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

Single Shot consistent with other pause methods

This commit is contained in:
Chris Esposito 2018-11-06 14:11:21 +11:00
parent 76154a6f7f
commit b0f5e98bff
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Desktop_Interface/isodriver.cpp
View File

@ -683,11 +683,6 @@ int isoDriver::trigger(void){
}
}
if(singleShotEnabled && (location != -1)) {
delay = triggerDelay;
delayUpdated(delay);
singleShotTriggered(1);
}
return location;
}
@ -797,6 +792,9 @@ void isoDriver::frameActionGeneric(char CH1_mode, char CH2_mode) //0 for off, 1
}
}
if(singleShotEnabled && (triggerDelay != 0))
singleShotTriggered(1);
readData375_CH1 = internalBuffer375_CH1->readBuffer(window,GRAPH_SAMPLES,CH1_mode==2, delay + (triggerEnabled ? triggerDelay + window/2 : 0));
if(CH2_mode) readData375_CH2 = internalBuffer375_CH2->readBuffer(window,GRAPH_SAMPLES,CH2_mode==2, delay + (triggerEnabled ? triggerDelay + window/2 : 0));
if(CH1_mode == -1) readData750 = internalBuffer750->readBuffer(window,GRAPH_SAMPLES,false, delay + (triggerEnabled ? triggerDelay + window/2 : 0));