Commit 16012f42 authored by Carlo Migoni's avatar Carlo Migoni
Browse files

new XK03 and XK06 Xarcos configurations

parent fead4dfe

Common/Interfaces/XBackendInterface/idl/XBackends.midl

+3 −3
Original line number Original line Diff line number Diff line
@@ -22,8 +22,8 @@ module Backends { 




	enum TXArcosConf {

	enum TXArcosConf {

		XArcos_K77,

		XArcos_K77,

		XArcos_K01,

		XArcos_K06,

		XArcos_K04,

		XArcos_K03,

        	XArcos_K00,

        	XArcos_K00,

		XArcos_C00

		XArcos_C00

	};

	};

Common/Servers/XBackend/src/CommandLine.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -1301,7 +1301,7 @@ AUTO_TRACE("CCommandLine::setMode8bit()"); 
		setSection(6,145,62.5,6,2,125,-1);

		setSection(6,145,62.5,6,2,125,-1);

		m_XarcosC=false;

		m_XarcosC=false;

    }

    }

    else if (config=="XK01") {

    else if (config=="XK06") {

        setMode8bit(true);

        setMode8bit(true);

		setSectionsNumber(4);

		setSectionsNumber(4);

		IRA::CIRATools::Wait(0,100000);

		IRA::CIRATools::Wait(0,100000);
@@ -1309,12 +1309,12 @@ AUTO_TRACE("CCommandLine::setMode8bit()"); 
		IRA::CIRATools::Wait(0,100000);

		IRA::CIRATools::Wait(0,100000);

		setSection(1,174.296875,3.90625,1,2,7.8125,-1);

		setSection(1,174.296875,3.90625,1,2,7.8125,-1);

		IRA::CIRATools::Wait(0,100000);

		IRA::CIRATools::Wait(0,100000);

		setSection(2,145,62.5,2,2,125,-1);

		setSection(2,145,62.5,6,2,125,-1);

		IRA::CIRATools::Wait(0,100000);

		IRA::CIRATools::Wait(0,100000);

		setSection(3,174.296875,3.90625,2,2,7.8125,-1);

		setSection(3,174.296875,3.90625,6,2,7.8125,-1);

		m_XarcosC=false;

		m_XarcosC=false;

    }

    }

    else if (config=="XK04") {

    else if (config=="XK03") {

        setMode8bit(true);

        setMode8bit(true);

        setSectionsNumber(4);

        setSectionsNumber(4);

		IRA::CIRATools::Wait(0,100000);

		IRA::CIRATools::Wait(0,100000);
@@ -1322,9 +1322,9 @@ AUTO_TRACE("CCommandLine::setMode8bit()"); 
		IRA::CIRATools::Wait(0,100000);

		IRA::CIRATools::Wait(0,100000);

		setSection(1,174.296875,3.90625,1,2,7.8125,-1);

		setSection(1,174.296875,3.90625,1,2,7.8125,-1);

		IRA::CIRATools::Wait(0,100000);

		IRA::CIRATools::Wait(0,100000);

		setSection(2,145,62.5,3,2,125,-1);

		setSection(2,145,62.5,2,2,125,-1);

		IRA::CIRATools::Wait(0,100000);

		IRA::CIRATools::Wait(0,100000);

		setSection(3,174.296875,3.90625,3,2,7.8125,-1);

		setSection(3,174.296875,3.90625,2,2,7.8125,-1);

		m_XarcosC=false;

		m_XarcosC=false;

    }

    }

    else if(config=="XK00") {

    else if(config=="XK00") {

Common/Servers/XBackend/src/XBackendsImpl.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -1038,7 +1038,7 @@ void XBackendsImpl::setXarcosConf(Backends::TXArcosConf conf) throw (CORBA::Syst 
			setSection(6,145,62.5,6,2,125,-1);

			setSection(6,145,62.5,6,2,125,-1);

			line->m_XarcosC=false;

			line->m_XarcosC=false;

			break;		

			break;		

		case (Backends::XArcos_K01): // XK01, CENTRAL FEED & FEED 1

		case (Backends::XArcos_K06): // XK06, CENTRAL FEED & FEED 6

			setMode8bit(true);

			setMode8bit(true);

			setSectionsNumber(4);

			setSectionsNumber(4);

			IRA::CIRATools::Wait(0,100000);

			IRA::CIRATools::Wait(0,100000);
@@ -1046,12 +1046,12 @@ void XBackendsImpl::setXarcosConf(Backends::TXArcosConf conf) throw (CORBA::Syst 
			IRA::CIRATools::Wait(0,100000);

			IRA::CIRATools::Wait(0,100000);

			setSection(1,174.296875,3.90625,1,2,7.8125,-1);

			setSection(1,174.296875,3.90625,1,2,7.8125,-1);

			IRA::CIRATools::Wait(0,100000);

			IRA::CIRATools::Wait(0,100000);

			setSection(2,145,62.5,2,2,125,-1);

			setSection(2,145,62.5,6,2,125,-1);

			IRA::CIRATools::Wait(0,100000);

			IRA::CIRATools::Wait(0,100000);

			setSection(3,174.296875,3.90625,2,2,7.8125,-1);

			setSection(3,174.296875,3.90625,6,2,7.8125,-1);

			line->m_XarcosC=false;

			line->m_XarcosC=false;

			break;

			break;

		case (Backends::XArcos_K04): // XK04, CENTRAL FEED & FEED 4

		case (Backends::XArcos_K03) // XK03, CENTRAL FEED & FEED 3

			setMode8bit(true);

			setMode8bit(true);

			setSectionsNumber(4);

			setSectionsNumber(4);

			IRA::CIRATools::Wait(0,100000);

			IRA::CIRATools::Wait(0,100000);
@@ -1059,9 +1059,9 @@ void XBackendsImpl::setXarcosConf(Backends::TXArcosConf conf) throw (CORBA::Syst 
			IRA::CIRATools::Wait(0,100000);

			IRA::CIRATools::Wait(0,100000);

			setSection(1,174.296875,3.90625,1,2,7.8125,-1);

			setSection(1,174.296875,3.90625,1,2,7.8125,-1);

			IRA::CIRATools::Wait(0,100000);

			IRA::CIRATools::Wait(0,100000);

			setSection(2,145,62.5,3,2,125,-1);

			setSection(2,145,62.5,2,2,125,-1);

			IRA::CIRATools::Wait(0,100000);

			IRA::CIRATools::Wait(0,100000);

			setSection(3,174.296875,3.90625,3,2,7.8125,-1);

			setSection(3,174.296875,2.90625,2,2,7.8125,-1);

			IRA::CIRATools::Wait(0,100000);

			IRA::CIRATools::Wait(0,100000);

			line->m_XarcosC=false;

			line->m_XarcosC=false;

			break;

			break;