From b8da137b86bdebba108ded3423c5e8ed767cccf9 Mon Sep 17 00:00:00 2001 From: Fabio Vitello Date: Tue, 19 Oct 2021 11:35:59 +0200 Subject: [PATCH] #588 Moved enabling of elevation tracking to station procedures --- .../src/MinorServoBossImpl.cpp | 18 +++++------------- .../StationProcedures/StationProcedures.xml | 9 +++++++++ .../StationProcedures/StationProcedures.xml | 9 +++++++++ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Medicina/Servers/MedicinaMinorServo/src/MinorServoBossImpl.cpp b/Medicina/Servers/MedicinaMinorServo/src/MinorServoBossImpl.cpp index 699ccfaba..2ecce1a28 100644 --- a/Medicina/Servers/MedicinaMinorServo/src/MinorServoBossImpl.cpp +++ b/Medicina/Servers/MedicinaMinorServo/src/MinorServoBossImpl.cpp @@ -327,22 +327,11 @@ MinorServoBossImpl::setup(const char *config) throw ( setupImpl(config); CUSTOM_LOG(LM_FULL_INFO, "MinorServo::MinorServoBossImpl::setup", (LM_NOTICE, "Minor Servo Setup: %s", config)); - //enable elevation tracking - try - { - if (isElevationTrackingEn()) - setElevationTrackingImpl(IRA::CString("ON")); - } - catch (...) - { - THROW_EX(MinorServoErrors, SetupErrorEx, "cannot turn the tracking on", - false); - } } catch (MinorServoErrors::SetupErrorExImpl& ex) { ex.log(LM_WARNING); throw ex.getSetupErrorEx(); - } + } } void @@ -408,11 +397,13 @@ throw (MinorServoErrors::SetupErrorExImpl) m_setup_thread_ptr = getContainerServices()->getThreadManager()-> create (SETUP_THREAD_NAME, thread_params); + if(m_setup_thread_ptr->isSuspended()) m_setup_thread_ptr->resume(); + CUSTOM_LOG(LM_FULL_INFO, "MinorServo::MinorServoBossImpl::setupImpl", (LM_DEBUG, "Started setup positioning thread")); - + }catch(const ServoTimeoutError& ste){ THROW_EX(MinorServoErrors, SetupErrorEx, ste.what(), false); }catch(const ServoConnectionError& sce){ @@ -421,6 +412,7 @@ throw (MinorServoErrors::SetupErrorExImpl) m_servo_status.starting = false; THROW_EX(MinorServoErrors, SetupErrorEx, "Cannot conclude setup >> "+boost::current_exception_diagnostic_information(), false); } + } void diff --git a/Noto/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/Noto/CDB/alma/Procedures/StationProcedures/StationProcedures.xml index 6ae47cf6f..e4c7c3c26 100644 --- a/Noto/CDB/alma/Procedures/StationProcedures/StationProcedures.xml +++ b/Noto/CDB/alma/Procedures/StationProcedures/StationProcedures.xml @@ -9,6 +9,7 @@ initialize=CCC receiversSetup=CCC servoSetup=SEC + setServoElevationTracking=ON asOn device=0 calmux=TotalPower @@ -26,6 +27,7 @@ initialize=MMC receiversSetup=MMC servoSetup=SEC + setServoElevationTracking=ON asOn device=0 calmux=TotalPower @@ -43,6 +45,7 @@ initialize=KKC receiversSetup=KKC servoSetup=SEC + setServoElevationTracking=ON asOn device=0 calmux=TotalPower @@ -58,6 +61,7 @@ initialize=QQC receiversSetup=QQC servoSetup=SEC + setServoElevationTracking=ON asOn device=0 calmux=TotalPower @@ -73,6 +77,7 @@ initialize=XXP receiversSetup=XXP servoSetup=SXP + setServoElevationTracking=OFF asOn device=0 calmux=TotalPower @@ -88,6 +93,7 @@ initialize=XXP receiversSetup=XXP servoSetup=SXP + setServoElevationTracking=OFF asOff device=0 calmux=TotalPower @@ -103,6 +109,7 @@ initialize=LLP receiversSetup=LLP servoSetup=LLP + setServoElevationTracking=OFF asOff device=0 calmux=TotalPower @@ -119,6 +126,7 @@ receiversSetup=SSP asOff servoSetup=SXP + setServoElevationTracking=OFF device=0 calmux=TotalPower calOff @@ -133,6 +141,7 @@ initialize=SSP receiversSetup=SSP servoSetup=SXP + setServoElevationTracking=OFF asOff device=0 calmux=TotalPower diff --git a/Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml index 6ae47cf6f..e4c7c3c26 100644 --- a/Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml +++ b/Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml @@ -9,6 +9,7 @@ initialize=CCC receiversSetup=CCC servoSetup=SEC + setServoElevationTracking=ON asOn device=0 calmux=TotalPower @@ -26,6 +27,7 @@ initialize=MMC receiversSetup=MMC servoSetup=SEC + setServoElevationTracking=ON asOn device=0 calmux=TotalPower @@ -43,6 +45,7 @@ initialize=KKC receiversSetup=KKC servoSetup=SEC + setServoElevationTracking=ON asOn device=0 calmux=TotalPower @@ -58,6 +61,7 @@ initialize=QQC receiversSetup=QQC servoSetup=SEC + setServoElevationTracking=ON asOn device=0 calmux=TotalPower @@ -73,6 +77,7 @@ initialize=XXP receiversSetup=XXP servoSetup=SXP + setServoElevationTracking=OFF asOn device=0 calmux=TotalPower @@ -88,6 +93,7 @@ initialize=XXP receiversSetup=XXP servoSetup=SXP + setServoElevationTracking=OFF asOff device=0 calmux=TotalPower @@ -103,6 +109,7 @@ initialize=LLP receiversSetup=LLP servoSetup=LLP + setServoElevationTracking=OFF asOff device=0 calmux=TotalPower @@ -119,6 +126,7 @@ receiversSetup=SSP asOff servoSetup=SXP + setServoElevationTracking=OFF device=0 calmux=TotalPower calOff @@ -133,6 +141,7 @@ initialize=SSP receiversSetup=SSP servoSetup=SXP + setServoElevationTracking=OFF asOff device=0 calmux=TotalPower -- GitLab