Skip to content
Snippets Groups Projects
Commit e2eafa1d authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Pushing some minor updates

parent f98438c6
No related branches found
No related tags found
No related merge requests found
......@@ -6,5 +6,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<BackendEntry><Backend>DBBC</Backend><Channel>6</Channel><Polarity>0</Polarity></BackendEntry>
<BackendEntry><Backend>DFB</Backend><Channel>7</Channel><Polarity>0</Polarity></BackendEntry>
</CalMuxTable>
......@@ -145,6 +145,7 @@
wait=1
antennaPark
logMessage=Telescope is now parked
project=Maintenance
</body>
</Procedure>
......
......@@ -6,6 +6,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<BackendEntry><Backend>DBBC</Backend><Channel>6</Channel><Polarity>0</Polarity></BackendEntry>
<BackendEntry><Backend>DFB</Backend><Channel>8</Channel><Polarity>0</Polarity></BackendEntry>
<BackendEntry><Backend>DFB</Backend><Channel>7</Channel><Polarity>0</Polarity></BackendEntry>
</CalMuxTable>
......@@ -145,6 +145,7 @@
wait=1
antennaPark
logMessage=Telescope is now parked
project=Maintenance
</body>
</Procedure>
......
......@@ -162,6 +162,15 @@ void SRTMinorServoBossCore::setup(std::string commanded_setup)
{
AUTO_TRACE("SRTMinorServoBossCore::setup()");
if(m_error_code.load() != ERROR_NO_ERROR)
{
_EXCPT(ManagementErrors::ConfigurationErrorExImpl, ex, "SRTMinorServoBossCore::setup()");
ex.setSubsystem("MinorServo");
ex.setReason("The system is in error state. Reset the errors first with the 'servoReset' command.");
ex.log(LM_DEBUG);
throw ex.getConfigurationErrorEx();
}
try
{
checkLineStatus();
......@@ -283,6 +292,15 @@ void SRTMinorServoBossCore::park()
{
AUTO_TRACE("SRTMinorServoBossCore::park()");
if(m_error_code.load() != ERROR_NO_ERROR)
{
_EXCPT(ManagementErrors::ParkingErrorExImpl, ex, "SRTMinorServoBossCore::park()");
ex.setSubsystem("MinorServo");
ex.setReason("The system is in error state. Reset the errors first with the 'servoReset' command.");
ex.log(LM_DEBUG);
throw ex.getParkingErrorEx();
}
try
{
checkLineStatus();
......
......@@ -66,7 +66,7 @@ void SRTMinorServoSetupThread::runLoop()
if(IRA::CIRATools::getUNIXEpoch() - m_start_time >= SETUP_TIMEOUT)
{
ACS_LOG(LM_FULL_INFO, "SRTMinorServoSetupThread::runLoop()", (LM_CRITICAL, "Timeout while performing a setup operation."));
ACS_LOG(LM_FULL_INFO, "SRTMinorServoSetupThread::runLoop()", (LM_CRITICAL, std::string("Timeout while configuring the system. Stopped at status " + std::to_string(m_status)).c_str()));
m_core.setError(ERROR_CONFIG_ERROR);
this->setStopped();
return;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment