Commit 02b10255 authored by aorlati's avatar aorlati
Browse files

fix issue #655: isuue tested at Noto. The status is now cleared after a power...

fix issue #655: isuue tested at Noto. The status is now cleared after a power failure. Also previously commended mode is reset.
parent db669afa
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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;
}
+2 −0
Original line number Diff line number Diff line
@@ -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,"");
+4 −4
Original line number Diff line number Diff line
@@ -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;	
			CUSTOM_LOG(LM_FULL_INFO,"CMedicinaMountSocket::checkPowerFailure()",(LM_CRITICAL,
			  "Servo system power failure cleared"));				
		}	
	}
}