From e2eafa1d146273557e2940b35e408d3e02e65a44 Mon Sep 17 00:00:00 2001
From: Giuseppe Carboni <giuseppecarboni89@live.com>
Date: Mon, 14 Oct 2024 10:40:03 +0000
Subject: [PATCH] Pushing some minor updates

---
 .../DataBlock/PyCalmux/Mapping/Mapping.xml     |  1 +
 .../StationProcedures/StationProcedures.xml    |  1 +
 .../DataBlock/PyCalmux/Mapping/Mapping.xml     |  2 +-
 .../StationProcedures/StationProcedures.xml    |  1 +
 .../src/SRTMinorServoBossCore.cpp              | 18 ++++++++++++++++++
 .../src/SRTMinorServoSetupThread.cpp           |  2 +-
 6 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/SRT/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml b/SRT/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml
index 96f138683..f083165cb 100755
--- a/SRT/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml
+++ b/SRT/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml
@@ -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>
diff --git a/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
index ef34edabf..e93c54bcc 100644
--- a/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+++ b/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
@@ -145,6 +145,7 @@
 	wait=1
 	antennaPark
 	logMessage=Telescope is now parked
+	project=Maintenance
 </body>
 </Procedure>
 
diff --git a/SRT/Configuration/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml b/SRT/Configuration/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml
index 091831a26..f083165cb 100755
--- a/SRT/Configuration/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml
+++ b/SRT/Configuration/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml
@@ -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>
diff --git a/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
index ef34edabf..e93c54bcc 100644
--- a/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+++ b/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
@@ -145,6 +145,7 @@
 	wait=1
 	antennaPark
 	logMessage=Telescope is now parked
+	project=Maintenance
 </body>
 </Procedure>
 
diff --git a/SRT/Servers/SRTMinorServo/src/SRTMinorServoBossCore.cpp b/SRT/Servers/SRTMinorServo/src/SRTMinorServoBossCore.cpp
index 3e8120561..7c50b8cca 100644
--- a/SRT/Servers/SRTMinorServo/src/SRTMinorServoBossCore.cpp
+++ b/SRT/Servers/SRTMinorServo/src/SRTMinorServoBossCore.cpp
@@ -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();
diff --git a/SRT/Servers/SRTMinorServo/src/SRTMinorServoSetupThread.cpp b/SRT/Servers/SRTMinorServo/src/SRTMinorServoSetupThread.cpp
index c48f98d14..d782a86cb 100644
--- a/SRT/Servers/SRTMinorServo/src/SRTMinorServoSetupThread.cpp
+++ b/SRT/Servers/SRTMinorServo/src/SRTMinorServoSetupThread.cpp
@@ -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;
-- 
GitLab