Merge branch '1.1.2_bugfixes' into 'master'
fix compilation errors and warnings See merge request epics-modules/adorca!27
This commit is contained in:
@@ -840,7 +840,7 @@ void Orca::imageTask() {
|
||||
double exposure_time, readout_time;
|
||||
double maxAcqusitionTime, acqusitionRate;
|
||||
int triggerMode = DCAMPROP_TRIGGERSOURCE__INTERNAL;
|
||||
int triggerActive, triggerTimes;
|
||||
int triggerActive;
|
||||
|
||||
lock();
|
||||
while (1) {
|
||||
@@ -994,9 +994,9 @@ void Orca::imageTask() {
|
||||
// getIntegerParam(hTriggerActive, &triggerActive);
|
||||
|
||||
if (triggerActive == DCAMPROP_TRIGGERACTIVE__SYNCREADOUT) {
|
||||
pass
|
||||
|
||||
} else if (triggerActive == DCAMPROP_TRIGGERACTIVE__LEVEL) {
|
||||
pass
|
||||
|
||||
} else {
|
||||
// Checks if the elapsed time since last frame is longer than the exposure,
|
||||
// stop waiting for image and put in timeout status.
|
||||
|
||||
Reference in New Issue
Block a user