Commit 8b1eae24 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by Laurent Claustre
Browse files

Read SPB status after sequencer status in Camera::getStatus:

* Protect against false Wait when sequencer finishes last image
  but SPB is still sending it to Espia
parent 2f5fe299
......@@ -786,8 +786,6 @@ void Camera::getStatus(Status& status, bool use_ser_line, bool read_spb)
THROW_HW_ERROR(NotSupported) << "SPB2/ser. line status "
"not supported: must upgrade to good HTD firmware";
int spb_status = read_spb ? getSPBStatus() : 0;
int ccd_status;
if (use_ser_line) {
readRegister(StatusSeqA, ccd_status);
......@@ -796,6 +794,7 @@ void Camera::getStatus(Status& status, bool use_ser_line, bool read_spb)
dev.getCcdStatus(ccd_status);
}
int spb_status = read_spb ? getSPBStatus() : 0;
ccd_status |= spb_status;
status = Status(ccd_status);
......
Supports Markdown
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