Commit de02d188 authored by aorlati's avatar aorlati
Browse files

Some Noto Active Surface updates

parent e2eafa1d

Noto/CDB/MACI/Components/WEATHERSTATION/WeatherStation/WeatherStation.xml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


    Name="WeatherStation"

    Code="NotoWeatherStationImpl"

    Type="IDL:alma/Weather/WeatherStation:1.0"

    Type="IDL:alma/Weather/GenericWeatherStation:1.0"

    Container="WeatherStationContainer"

	Default="true"

	KeepAliveTime="-1"

Noto/Configuration/CDB/MACI/Components/BACKENDS/TotalPower/TotalPower.xml

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
	Code="TotalPowerImpl"

	Type="IDL:alma/Backends/TotalPower:1.0"

	Container="TotalPowerContainer"

	Default="true"

	KeepAliveTime="-1"

    ImplLang="cpp"

/>

Noto/Configuration/CDB/alma/BACKENDS/TotalPower/TotalPower.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
               RepetitionCacheTime="2000000"

               RepetitionExpireTime="5000000"

               DataPort="9001"

               DataIPAddress="192.167.187.17"            	   

               DataIPAddress="192.167.187.40"

               DataLatency="3000000"

               SenderSleepTime="300000"

               SenderResponseTime="1000000"

Noto/Misc/NotoScripts/app-defaults/discosStartup.xml

+42 −6
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
    <toolAgainstInterfaceRepository></toolAgainstInterfaceRepository>

    <toolAgainstNameService></toolAgainstNameService>

    <containers>

        <select>15</select>

        <select>20</select>

        <againstManagerHost></againstManagerHost>

        <againstManagerPort></againstManagerPort>

        <againstCDB></againstCDB>
@@ -127,6 +127,33 @@ 
            <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>ExternalClientsContainer</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount>discos</remoteAccount>

        </container>

        <container>

            <name>PyCalmuxContainer</name>

            <type>py</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount>discos</remoteAccount>

        </container>

        <container>

            <name>NotoActiveSurfaceContainer</name>

            <type>cpp</type>
@@ -137,7 +164,7 @@ 
            <remoteAccount>discos</remoteAccount>

        </container>

        <container>

            <name>MinorServoBossContainer</name>

            <name>NotoActiveSurfaceContainer01</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>
@@ -146,7 +173,7 @@ 
            <remoteAccount>discos</remoteAccount>

        </container>

        <container>

            <name>ExternalClientsContainer</name>

            <name>NotoActiveSurfaceContainer02</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>
@@ -155,8 +182,17 @@ 
            <remoteAccount>discos</remoteAccount>

        </container>

        <container>

            <name>PyCalmuxContainer</name>

            <type>py</type>

            <name>NotoActiveSurfaceContainer03</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount>discos</remoteAccount>

        </container>

        <container>

            <name>NotoActiveSurfaceContainer04</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

Noto/Servers/NotoActiveSurfaceBoss/src/NotoActiveSurfaceBossCore.cpp

+5 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ void CNotoActiveSurfaceBossCore::execute() throw (ComponentErrors::CouldntGetCom 
    {

        m_status=Management::MNG_FAILURE;

    }



*/

    m_antennaBoss = Antenna::AntennaBoss::_nil();

    try

    {
@@ -173,7 +173,7 @@ void CNotoActiveSurfaceBossCore::execute() throw (ComponentErrors::CouldntGetCom 
        m_status=Management::MNG_WARNING;

        throw Impl;

    }

*/



    m_enable = true;

    ACS_LOG(LM_FULL_INFO, "CNotoActiveSurfaceBossCore::execute()", (LM_INFO,"CNotoActiveSurfaceBossCore::NotoActiveSurfaceBoss_LOCATED"));

}
@@ -1366,10 +1366,13 @@ void CNotoActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& new 
        {

            for (int l = 1; l <= actuatorsInCircle[i]; l++)

            {

                //printf("i = %d, l = %d, ",i,l);

                for (int s = 0; s < NPOSITIONS; s++)

                {

                    usdCorrections >> actuatorsCorrections[s];

                //    printf("corr = %f ", actuatorsCorrections[s]);

                }

                //printf("\n");

                if(!CORBA::is_nil(usd[i][l]))

                {

                    usd[i][l]->posTable(actuatorsCorrections, NPOSITIONS, DELTAEL, THRESHOLDPOS);