Commit 31e69513 authored by Laurent Claustre's avatar Laurent Claustre
Browse files

Merge branch 'master' of git.epn-campus.eu:Lima

parents cde266f7 18cb959f
......@@ -1013,6 +1013,9 @@ void Camera::setShutCloseTime(double shut_time)
DEB_MEMBER_FUNCT();
DEB_PARAM() << DEB_VAR1(shut_time);
int shut_val = int(shut_time / TimeUnitFactorMap[Milliseconds] + 0.1);
if (shut_val > MaxRegVal)
THROW_HW_ERROR(InvalidValue) << "Shutter close time too high: "
<< DEB_VAR1(shut_time);
writeRegister(ShutCloseTime, shut_val);
}
......
......@@ -498,7 +498,7 @@ void ShutterCtrlObj::setMode(ShutterMode shut_mode)
DEB_PARAM() << DEB_VAR1(shut_mode);
if (!checkMode(shut_mode))
THROW_HW_ERROR(InvalidValue) << "Invalid "
THROW_HW_ERROR(NotSupported) << "Invalid (not supported) "
<< DEB_VAR1(shut_mode);
ShutMode cam_mode;
......@@ -549,8 +549,8 @@ void ShutterCtrlObj::setOpenTime(double shut_open_time)
DEB_PARAM() << DEB_VAR1(shut_open_time);
if (shut_open_time != 0)
THROW_HW_ERROR(NotSupported) << "Invalid "
<< DEB_VAR1(shut_open_time);
THROW_HW_ERROR(NotSupported) << "Shutter open time not "
"supported";
}
void ShutterCtrlObj::getOpenTime(double& shut_open_time) const
......
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