Commit 3b35498a authored by Alejandro Homs Puron's avatar Alejandro Homs Puron

* Returning the expected DetIdle status when working in IntTrigMult

parent 5442c068
......@@ -896,8 +896,8 @@ void Interface::startAcq()
TrigMode trig_mode;
m_cam.getTrigMode(trig_mode);
bool acq_start = (trig_mode != IntTrigMult) || !m_cam.isRunning();
if (acq_start) {
bool was_running = (trig_mode == IntTrigMult) && m_cam.isRunning();
if (!was_running) {
m_buffer_mgr.setStartTimestamp(Timestamp::now());
m_acq.start();
}
......@@ -905,7 +905,7 @@ void Interface::startAcq()
try {
m_cam.start();
} catch (...) {
if (acq_start)
if (!was_running)
m_acq.stop();
throw;
}
......@@ -945,6 +945,11 @@ void Interface::getStatus(StatusType& status)
if (cam & Frelon::Latency)
status.det |= DetLatency;
TrigMode trig_mode;
m_cam.getTrigMode(trig_mode);
if ((trig_mode == IntTrigMult) && (status.det == DetWaitForTrigger))
status.det = DetIdle;
DEB_RETURN() << DEB_VAR1(status);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment