Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions camerad/archon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4958,15 +4958,15 @@ namespace Archon {
return NO_ERROR;
}

// Set the time-out value. If the exposure time is less than a second, set
// Set the time-out value in ms. If the exposure time is less than a second, set
// the timeout to 1 second. Otherwise, set it to the exposure time plus
// 1 second.
//
if ( this->camera_info.exposure_time / this->camera_info.exposure_factor < 1 ) {
exposure_timeout_time = 1000; //ms

} else {
exposure_timeout_time = (this->camera_info.exposure_time) + 1000;
exposure_timeout_time = (this->camera_info.exposure_time / this->camera_info.exposure_factor) * 1000 + 1000;
}

// Now start polling the Archon for the last remaining portion of the exposure delay
Expand Down