Commit 7a5ad146 authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Merging SRT active surface updates onto this branch 

Merge branch 'active-surface-updates' of https://github.com/discos/discos into centos_7_compatibility
parents f3ce596f 6183b98d

Common/Servers/ActiveSurfaceUSD/src/ActiveSurfaceUSDImpl.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -144,6 +144,7 @@ void USDImpl::initialize() throw (ACSErr::ACSbaseExImpl) 
            _SET_LDEF(acc,   "USDImpl::initialize()");

            _SET_LDEF(acc,   "USDImpl::initialize()");

            _SET_LDEF(uBits, "USDImpl::initialize()");

            _SET_LDEF(uBits, "USDImpl::initialize()");

        }

        }

        _GET_PROP(status,m_status,"usdImpl::initialize()")

    }

    }

    catch (ASErrors::ASErrorsEx& ex)

    catch (ASErrors::ASErrorsEx& ex)

    {

    {
@@ -324,6 +325,8 @@ void USDImpl::reset() throw (CORBA::SystemException,ASErrors::ASErrorsEx) 
        //_SET_CDB(calibrate, m_calibrate, "::USDImpl::reset()")

        //_SET_CDB(calibrate, m_calibrate, "::USDImpl::reset()")

        action(RESET);

        action(RESET);





        CIRATools::Wait(0, 200000); // 0.2 secs, guard time to wait after a reset command



        //* restore defaults *//

        //* restore defaults *//

        _SET_LDEF(delay, "USDImpl::reset()");

        _SET_LDEF(delay, "USDImpl::reset()");

        _SET_LDEF(Fmax,  "USDImpl::reset()");

        _SET_LDEF(Fmax,  "USDImpl::reset()");

SRT/CDB/MACI/Containers/SRTActiveSurfaceContainer01/SRTActiveSurfaceContainer01.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -22,6 +22,5 @@ 
		flushPeriodSeconds="1"

		flushPeriodSeconds="1"

	>

	>

	</LoggingConfig>

	</LoggingConfig>

	

</Container>

</Container>

SRT/CDB/MACI/Containers/SRTActiveSurfaceContainer06/SRTActiveSurfaceContainer06.xml

+22 −7
Original line number Original line Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1'?>

<?xml version="1.0" encoding="ISO-8859-1"?>

<!--



   - History:

<Container

   -   Tue Sep 23 09:22:44 UTC 2008 modified by jDAL

	xmlns="urn:schemas-cosylab-com:Container:1.0"

-->

	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

<Container xmlns="urn:schemas-cosylab-com:Container:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0" Timeout="30.0" ServerThreads="5" ImplLang="cpp">

	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

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

	xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0"

	Timeout="30.0"

	ServerThreads="5"

	ImplLang="cpp">



	<Autoload>

	<Autoload>

		<cdb:e string="baci" />

		<cdb:e string="baci" />

	</Autoload>

	</Autoload>

	<LoggingConfig minLogLevel="5" minLogLevelLocal="10" dispatchPacketSize="0" immediateDispatchLevel="10" flushPeriodSeconds="1" />



	<LoggingConfig

		minLogLevel="5"

		minLogLevelLocal="5"

		dispatchPacketSize="0"

		immediateDispatchLevel="10"

		flushPeriodSeconds="1"

	>

	</LoggingConfig>

</Container>

</Container>

SRT/CDB/MACI/Containers/SRTActiveSurfaceContainer07/SRTActiveSurfaceContainer07.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
	<LoggingConfig

	<LoggingConfig

		minLogLevel="5"

		minLogLevel="5"

		minLogLevelLocal="5"

		minLogLevelLocal="5"

		dispatchPacketSize="10"

		dispatchPacketSize="0"

		immediateDispatchLevel="10"

		immediateDispatchLevel="10"

		flushPeriodSeconds="1"

		flushPeriodSeconds="1"

	>

	>

SRT/CDB/alma/AS/Boss/Boss.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -9,4 +9,5 @@ 
	<enabled />

	<enabled />

	<pprofile />

	<pprofile />

	<tracking />

	<tracking />

	<LUT_filename />

</SRTActiveSurfaceBoss>
 
</SRTActiveSurfaceBoss>