Commit 05ecf709 authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Updates for the SRTMinorServos

parent c8034270

SRT/Configuration/CDB/alma/MINORSERVO/Socket/Socket.xml

+2 −1
Original line number Diff line number Diff line
@@ -9,4 +9,5 @@ 
    xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

    IPAddress="192.168.200.13"

    Port="4758"/>
 
    Port="4758"

    SocketTimeout="0.2"/>

SRT/Misc/SRTScripts/app-defaults/discosStartup.xml

+1 −10
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
    <toolAgainstInterfaceRepository></toolAgainstInterfaceRepository>

    <toolAgainstNameService></toolAgainstNameService>

    <containers>

        <select>36</select>

        <select>34</select>

        <againstManagerHost></againstManagerHost>

        <againstManagerPort></againstManagerPort>

        <againstCDB></againstCDB>
@@ -109,15 +109,6 @@ 
            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount>discos</remoteAccount>

        </container>

        <container>

            <name>MinorServoBossContainer</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount>discos</remoteAccount>

        </container>

        <container>

            <name>MinorServoContainer</name>

            <type>cpp</type>

SRT/Servers/SRTMinorServo/src/SRTMinorServoBossCore.cpp

+2 −2
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ void SRTMinorServoBossCore::park() 
    try

    {

        // Send the STOW command to close the gregorian cover

        if(!m_socket.sendCommand(SRTMinorServoCommandLibrary::stow("GREGORIAN_CAP", COVER_STATUS_CLOSED)).checkOutput())

        if(!m_socket.sendCommand(SRTMinorServoCommandLibrary::stow("Gregoriano", COVER_STATUS_CLOSED)).checkOutput())

        {

            _EXCPT(ManagementErrors::ParkingErrorExImpl, ex, "SRTMinorServoBossCore::park()");

            ex.setSubsystem("MinorServo");
@@ -513,7 +513,7 @@ void SRTMinorServoBossCore::setGregorianCoverPosition(std::string position) 


    ACS_LOG(LM_FULL_INFO, "setGregorianCoverPosition", (LM_INFO, ("SETTING GREGORIAN COVER POSITION TO " + position).c_str()));



    if(!m_socket.sendCommand(SRTMinorServoCommandLibrary::stow("GREGORIAN_CAP", position == "OPEN" ? COVER_STATUS_OPEN : COVER_STATUS_CLOSED)).checkOutput())

    if(!m_socket.sendCommand(SRTMinorServoCommandLibrary::stow("Gregoriano", position == "OPEN" ? COVER_STATUS_OPEN : COVER_STATUS_CLOSED)).checkOutput())

    {

        _EXCPT(MinorServoErrors::StowErrorExImpl, ex, "SRTMinorServoBossCore::setGregorianCoverPosition()");

        ex.addData("Reason", "Error while sending a STOW command to the gregorian cover.");

SRT/Servers/SRTMinorServo/src/SRTMinorServoSetupThread.cpp

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void SRTMinorServoSetupThread::runLoop() 
        }

        case 100: // Send the STOW command to the gregorian cover

        {

            if(!m_core.m_socket.sendCommand(SRTMinorServoCommandLibrary::stow("GREGORIAN_CAP", m_gregorian_cover_position)).checkOutput())

            if(!m_core.m_socket.sendCommand(SRTMinorServoCommandLibrary::stow("Gregoriano", m_gregorian_cover_position)).checkOutput())

            {

                ACS_LOG(LM_FULL_INFO, "SRTMinorServoSetupThread::runLoop()", (LM_ERROR, "Received NAK when setting the gregorian cover position."));

                m_core.setFailure();

SystemMake/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ COMMON_SIMULATORS:= TCPGenericProtocolSim ReceiverBoardSim 
SRT_DOC:=SRTDox

SRT_ERRORS:=

SRT_INTERFACES:=SRTAntennaInterface SRTActiveSurfaceInterface \

                SRTReceiversInterface

                SRTMinorServoInterface SRTReceiversInterface

SRT_LIBRARIES:=SRTMinorServoLibrary

SRT_SERVERS:=SRTMount SRTActiveSurfaceBoss SRTMinorServo SRTKBandMFReceiver \

             SRT7GHzReceiver SRT5GHzReceiver SRTLPBandReceiver SRTPyIFDistributor WeatherStation