Commit b8da137b authored by Fabio Vitello's avatar Fabio Vitello
Browse files

#588 Moved enabling of elevation tracking to station procedures

parent 58da6c38

Medicina/Servers/MedicinaMinorServo/src/MinorServoBossImpl.cpp

+5 −13
Original line number Diff line number Diff line
@@ -327,17 +327,6 @@ 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);
@@ -408,8 +397,10 @@ throw (MinorServoErrors::SetupErrorExImpl) 
        m_setup_thread_ptr = getContainerServices()->getThreadManager()->

                                create<SetupThread, SetupThreadParameters>

                                 (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"));
@@ -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

Noto/CDB/alma/Procedures/StationProcedures/StationProcedures.xml

+9 −0
Original line number Diff line number Diff line
@@ -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

Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml

+9 −0
Original line number Diff line number Diff line
@@ -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