Commit e2eafa1d authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Pushing some minor updates

parent f98438c6

SRT/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml

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

SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ 
	wait=1

	antennaPark

	logMessage=Telescope is now parked

	project=Maintenance

</body>

</Procedure>

SRT/Configuration/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml

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

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

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ 
	wait=1

	antennaPark

	logMessage=Telescope is now parked

	project=Maintenance

</body>

</Procedure>

SRT/Servers/SRTMinorServo/src/SRTMinorServoBossCore.cpp

+18 −0
Original line number Diff line number Diff line
@@ -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();