diff --git a/Medicina/Servers/MedicinaMount/src/ACUInterface.cpp b/Medicina/Servers/MedicinaMount/src/ACUInterface.cpp index a9d78da13a233848a901cc001f840ce011a7def3..7dcb00ad1a5163a37b90f7bf4aa5e816b0b08f66 100644 --- a/Medicina/Servers/MedicinaMount/src/ACUInterface.cpp +++ b/Medicina/Servers/MedicinaMount/src/ACUInterface.cpp @@ -249,7 +249,7 @@ CACUInterface::TAntennaSection CACUInterface::getSection(WORD controlWord) bool CACUInterface::getDrivePower(WORD controlWord) { - if (controlWord & (1 << 15)) return true; - else return false; + if (controlWord & (1 << 15)) return false; + else return true; } diff --git a/Medicina/Servers/MedicinaMount/src/Configuration.cpp b/Medicina/Servers/MedicinaMount/src/Configuration.cpp index ebd3b3b2b5b39cfed7c43b133495e651a611ca70..b7ec59ded99813e3ff67ca01b248a9c4e300e0df 100644 --- a/Medicina/Servers/MedicinaMount/src/Configuration.cpp +++ b/Medicina/Servers/MedicinaMount/src/Configuration.cpp @@ -66,9 +66,11 @@ void CConfiguration::Init(maci::ContainerServices *Services) throw (ComponentErr _GET_DOUBLE_ATTRIBUTE("cw_ccw_limit","CW/CCW limit (degrees):",m_cwLimit,"DataBlock/Mount"); _GET_STRING_ATTRIBUTE("CheckOscillation","Check oscillation during tracking: ",check,""); + check.MakeUpper(); m_checkOsc=(check=="TRUE"); _GET_STRING_ATTRIBUTE("CheckMode","Check ACU mode enabled: ",check,""); + check.MakeUpper(); m_checkMode=(check=="TRUE"); _GET_DOUBLE_ATTRIBUTE("OscillationThreshold","Oscillation theshold (deg):",m_doscThreashold,""); diff --git a/Medicina/Servers/MedicinaMount/src/MedicinaMountSocket.cpp b/Medicina/Servers/MedicinaMount/src/MedicinaMountSocket.cpp index 19004f193f98b44c5c7f5c852e832dcc41086e02..e018632aaa83c3f751d9a7b023a192c064086f4d 100644 --- a/Medicina/Servers/MedicinaMount/src/MedicinaMountSocket.cpp +++ b/Medicina/Servers/MedicinaMount/src/MedicinaMountSocket.cpp @@ -862,13 +862,13 @@ void CMedicinaMountSocket::checkPowerFailure() throw (ComponentErrors::TimeoutEx m_powerFailDetected=true; } else { // no power error - if (!m_powerFailDetected) { //first detection - CUSTOM_LOG(LM_FULL_INFO,"CMedicinaMountSocket::checkPowerFailure()",(LM_CRITICAL, - "Servo system power failure cleared")); + if (m_powerFailDetected) { //first detection CUSTOM_LOG(LM_FULL_INFO,"CMedicinaMountSocket::checkPowerFailure()",(LM_NOTICE, "Trying a servo system reset")); failureReset();// throw (TimeoutExImpl,AntennaErrors::NakExImpl,ConnectionExImpl,SocketErrorExImpl) - m_powerFailDetected=false; + m_powerFailDetected=false; + CUSTOM_LOG(LM_FULL_INFO,"CMedicinaMountSocket::checkPowerFailure()",(LM_CRITICAL, + "Servo system power failure cleared")); } } }