Commit c0bdaddc authored by Carlo Migoni's avatar Carlo Migoni
Browse files

added Noto Active Surface

parent b96b6fa2

Medicina/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml

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

       Name="LAN01"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp">

       Name="LAN01"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp">

      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>

      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>

      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>

Medicina/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml

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

       Name="LAN02"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0" Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp">

       Name="LAN02"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0" Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp">

      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>

      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>

      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>

Medicina/Servers/MedicinaActiveSurfaceBoss/include/MedicinaActiveSurfaceBossCore.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define CIRCLES 7

#define ACTUATORS 48

#define firstUSD 1

#define lastUSD 264

#define lastUSD 268

#define LOOPTIME 100000 // 0,10 sec

#define CDBPATH std::string(getenv("ACS_CDB")) + "/CDB/"

#define USDTABLE (CDBPATH + "alma/AS/tab_convUSD.txt").c_str()

Medicina/Servers/MedicinaActiveSurfaceBoss/src/MedicinaActiveSurfaceBossCore.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#include <Definitions.h>

#include <cstdio>



int actuatorsInCircle[] = {0,24,48,48,48,48,48};

int actuatorsInCircle[] = {0,24,48,48,48,48,48,4};



CMedicinaActiveSurfaceBossCore::CMedicinaActiveSurfaceBossCore(ContainerServices *service, acscomponent::ACSComponentImpl *me) :

    m_services(service),

Noto/CDB/MACI/Components/AS/Boss/Boss.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,4 +14,5 @@ 
	Container="NotoActiveSurfaceContainer"

	ImplLang="cpp"

	Default="true"

	KeepAliveTime="-1"

/>