Commit 7bc3050f authored by Alejandro Homs Puron's avatar Alejandro Homs Puron

* Back-ported fixes and non-core features from (future core-1.2) master branch

parent 66af9a4a
tango @ 10451eb9
Subproject commit 3d4475961215f1c8b1b1201e9899618a41c29ccb
Subproject commit 10451eb93bd6b01d333c76146a9e16fe2afa9bc3
andor @ 960fb2f8
Subproject commit 5f160efba768e8bc9bfd9874becb641485d78698
Subproject commit 960fb2f819c53a193b48c046da34f48d0a555609
maxipix @ 18fcc674
Subproject commit 7d76abde78de3567f227e2e44b8342bfed6bf7f9
Subproject commit 18fcc67425c0fbad7086474e64c88e24c90e8796
xpad @ 445adcdd
Subproject commit 9d8e21a290276dfbf2515fb0809078717ebc9172
Subproject commit 445adcddef9cdcd36a51ef2c74d440f8be7f820f
......@@ -77,7 +77,6 @@ CtAcquisition::CtAcquisition(HwInterface *hw) :
m_hw_sync->registerValidRangesCallback(m_valid_ranges_cb);
DEB_TRACE() << DEB_VAR1(m_valid_ranges);
m_applied_once= false;
reset();
}
......@@ -117,6 +116,7 @@ void CtAcquisition::reset()
m_inpars.reset();
m_inpars.latencyTime = m_valid_ranges.min_lat_time;
m_applied_once= false;
}
void CtAcquisition::apply(CtControl::ApplyPolicy policy)
......@@ -128,7 +128,7 @@ void CtAcquisition::apply(CtControl::ApplyPolicy policy)
use_policy= m_applied_once ? policy : CtControl::All;
switch (policy) {
switch (use_policy) {
case CtControl::All:
// --- apply all parameters
m_changes.set(1);
......@@ -149,7 +149,7 @@ void CtAcquisition::apply(CtControl::ApplyPolicy policy)
m_changes.set(1);
_apply();
}
m_applied_once = true;
}
void CtAcquisition::sync()
......
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