Merge pull request #16 from NSLentz/add-interlock-with-qrix-motion

Added interface with qrix-motion plc. Copied changes to SampleChamber logic from PR15. INTERLOCKS STILL NEED TO BE PROGRAMMED, ONLY INTERFACE WAS ADDED.
pcdshub · Mar 19, 2024 · 09f3fdd · 09f3fdd
2 parents d8cff0a + 41d0ae5
commit 09f3fdd
Show file tree

Hide file tree

Showing 10 changed files with 46,706 additions and 626 deletions.
diff --git a/lcls-plc-qrix-vac/lcls-plc-qrix-vac.sln b/lcls-plc-qrix-vac/lcls-plc-qrix-vac.sln
@@ -33,22 +33,22 @@ Global
 		{9C4D6FE4-BAD3-46FA-AB47-D8CA4E35364B}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
 		{9C4D6FE4-BAD3-46FA-AB47-D8CA4E35364B}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
 		{9C4D6FE4-BAD3-46FA-AB47-D8CA4E35364B}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
-		{C83E16AF-F7F9-4F35-82F1-727A74D35437}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
+		{613EA869-5132-4B58-88FA-9F86BC3E0B35}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Interface.TcGVL b/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Interface.TcGVL
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
+  <GVL Name="GVL_Interface" Id="{a7b0d595-db2a-4877-bd39-489561f20390}">
+    <Declaration><![CDATA[{attribute 'qualified_only'}
+VAR_GLOBAL
+
+    (*I/O Inputs to QRIX Motion PLC*)
+
+    {attribute 'TcLinkTo' :=  'TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EK1122_00_16^QRIX_MOT_INT (EL6692)^IO Inputs^QRIX_MOT_SDS_MMS_H_RAW_ENC_CNTS
+    '}
+    QRIX_MOT_SDS_MMS_H_RAW_ENC_CNTS AT %I* : UINT;
+
+    {attribute 'TcLinkTo' :=  'TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EK1122_00_16^QRIX_MOT_INT (EL6692)^IO Inputs^QRIX_MOT_SDS_MMS_H_FORWARD_EN
+    '}
+    QRIX_MOT_SDS_MMS_H_FORWARD_EN AT %I* : BOOL;
+
+    {attribute 'TcLinkTo' :=  'TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EK1122_00_16^QRIX_MOT_INT (EL6692)^IO Inputs^QRIX_MOT_SDS_MMS_H_BACKWARD_EN
+    '}
+    QRIX_MOT_SDS_MMS_H_BACKWARD_EN AT %I* : BOOL;
+
+    (*I/O Outputs to QRIX Motion PLC*)
+
+    {attribute 'TcLinkTo' :=  'TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EK1122_00_16^QRIX_MOT_INT (EL6692)^IO Outputs^QRIX_VAC_VGC_03_OP_CMD
+    '}
+    QRIX_VAC_VGC_03_OP_CMD AT %Q* : BOOL;
+
+    {attribute 'TcLinkTo' :=  'TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EK1122_00_16^QRIX_MOT_INT (EL6692)^IO Outputs^QRIX_VAC_VGC_03_CL_CMD
+    '}
+    QRIX_VAC_VGC_03_CL_CMD AT %Q* : BOOL;
+END_VAR]]></Declaration>
+  </GVL>
+</TcPlcObject>
diff --git a/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/PLC_QRIX_VAC.plcproj b/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/PLC_QRIX_VAC.plcproj
@@ -33,6 +33,10 @@
       <SubType>Code</SubType>
       <LinkAlways>true</LinkAlways>
     </Compile>
+    <Compile Include="GVLs\GVL_Interface.TcGVL">
+      <SubType>Code</SubType>
+      <LinkAlways>true</LinkAlways>
+    </Compile>
     <Compile Include="GVLs\GVL_PMPS.TcGVL">
       <SubType>Code</SubType>
       <LinkAlways>true</LinkAlways>

diff --git a/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/PLC_QRIX_VAC.tmc b/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/PLC_QRIX_VAC.tmc
diff --git a/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/POUs/PRG_SDS.TcPOU b/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/POUs/PRG_SDS.TcPOU
@@ -18,10 +18,10 @@ fb_QRIX_SDS_VVC_02(i_xExtILK_OK := TRUE, i_xOverrideMode := xSystemOverrideMode,
 
 //VRC
 (*fb_QRIX_SDS_VRC_01(i_xOverrideMode := xSystemOverrideMode, iq_stValve =>);
-fb_QRIX_SDS_VRC_01.i_xExtILK_OK := F_TurboGateValve_Protection_ILK( i_Turbo := QRIX_SD_PTM_01.iq_stPTM , 
-																   i_stISG := fb_QRIX_SDS_GPI_01.PG, i_stBSG := fb_QRIX_SC_GPI_01.PG,
-																	ScrollPump := fb_QRIX_PRO_01 );
-																	
+fb_QRIX_SDS_VRC_01.i_xExtILK_OK := F_TurboGateValve_Protection_ILK( i_Turbo := QRIX_SD_PTM_01.iq_stPTM ,
+                                                                   i_stISG := fb_QRIX_SDS_GPI_01.PG, i_stBSG := fb_QRIX_SC_GPI_01.PG,
+                                                                    ScrollPump := fb_QRIX_PRO_01 );
+
 *)
 ]]></ST>
     </Implementation>

diff --git a/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/POUs/PRG_SampleChamber.TcPOU b/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/POUs/PRG_SampleChamber.TcPOU
@@ -3,34 +3,34 @@
   <POU Name="PRG_SampleChamber" Id="{cb28682b-30d3-426f-a474-a5d2845e7f8a}" SpecialFunc="None">
     <Declaration><![CDATA[PROGRAM PRG_SampleChamber
 VAR
-	QRIX: T_MaxString;
-	iWatchdog: UDINT;
-	RIX_TV4K2_GFS_1:FB_TGCC_ADS;
-	RIX_IM5K2_PPM_GCC_1:FB_TGCC_ADS;
-	
-	//PTM interlocks
-	qRIXS_SC_PTM_10_ILK : FB_ChemRIXS_Turbo_ILK;
-	qRIXS_SC_PTM_20_ILK : FB_ChemRIXS_Turbo_ILK;
-	qRIXS_SC_PTM_30_ILK : FB_ChemRIXS_Turbo_ILK;
+    QRIX: T_MaxString;
+    iWatchdog: UDINT;
+    RIX_TV4K2_GFS_1:FB_TGCC_ADS;
+    RIX_IM5K2_PPM_GCC_1:FB_TGCC_ADS;
+
+    //PTM interlocks
+    qRIXS_SC_PTM_10_ILK : FB_ChemRIXS_Turbo_ILK;
+    qRIXS_SC_PTM_20_ILK : FB_ChemRIXS_Turbo_ILK;
+    qRIXS_SC_PTM_30_ILK : FB_ChemRIXS_Turbo_ILK;
 END_VAR
 ]]></Declaration>
     <Implementation>
       <ST><![CDATA[//ADS interfaces
 RIX_TV4K2_GFS_1(
-	sNetId:= '172.21.140.69.1.1', 
-	nPort:= 851, 
-	sVarName:= 'GVL_KFE_RIX_VAC.fb_TV4K2_GFS_1', 
-	iWatchdog:= iWatchdog , 
-	IG=> , 
-	bError=> );
+    sNetId:= '172.21.140.69.1.1',
+    nPort:= 851,
+    sVarName:= 'GVL_KFE_RIX_VAC.fb_TV4K2_GFS_1',
+    iWatchdog:= iWatchdog ,
+    IG=> ,
+    bError=> );
 RIX_IM5K2_PPM_GCC_1(
-	sNetId:= '172.21.140.69.1.1', 
-	nPort:= 851, 
-	sVarName:= 'GVL_KFE_RIX_VAC.fb_IM5K2_PPM_GCC_1', 
-	iWatchdog:= iWatchdog , 
-	IG=> , 
-	bError=> );
-	
+    sNetId:= '172.21.140.69.1.1',
+    nPort:= 851,
+    sVarName:= 'GVL_KFE_RIX_VAC.fb_IM5K2_PPM_GCC_1',
+    iWatchdog:= iWatchdog ,
+    IG=> ,
+    bError=> );
+
 //MKS 275 Gauges
 qRIXS_SC_GPI_01.M_SetBits(30518);
 qRIXS_SC_GPI_01(PG=>);
@@ -51,91 +51,93 @@ qRIXS_SSL_GCP_30();
 qRIXS_SC_PIP_01(i_stGauge:=qRIXS_SC_GPI_01.PG, i_xOverrideMode:= xSystemOverrideMode);
 qRIXS_SC_PIP_02(i_stGauge:=qRIXS_SC_GPI_01.PG, i_xOverrideMode:= xSystemOverrideMode);
 
-//Pfiffer Turbo 
+//Pfiffer Turbo
 
 //VVC
 qRIXS_SC_VVC_01.i_xExtILK_OK := qRIXS_SC_PTM_10.iq_stPTM.eState = E_PumpState.pumpSTOPPED
-							AND qRIXS_SC_PTM_20.iq_stPTM.eState = E_PumpState.pumpSTOPPED
-							AND qRIXS_SC_PTM_30.iq_stPTM.eState = E_PumpState.pumpSTOPPED;
+                            AND qRIXS_SC_PTM_20.iq_stPTM.eState = E_PumpState.pumpSTOPPED
+                            AND qRIXS_SC_PTM_30.iq_stPTM.eState = E_PumpState.pumpSTOPPED;
 qRIXS_SC_VVC_01(i_xExtILK_OK := , i_xOverrideMode := xSystemOverrideMode, iq_stValve => );
 qRIXS_SC_VVC_02.i_xExtILK_OK := qRIXS_SC_PTM_10.iq_stPTM.eState = E_PumpState.pumpSTOPPED
-							AND qRIXS_SC_PTM_20.iq_stPTM.eState = E_PumpState.pumpSTOPPED
-							AND qRIXS_SC_PTM_30.iq_stPTM.eState = E_PumpState.pumpSTOPPED;
+                            AND qRIXS_SC_PTM_20.iq_stPTM.eState = E_PumpState.pumpSTOPPED
+                            AND qRIXS_SC_PTM_30.iq_stPTM.eState = E_PumpState.pumpSTOPPED;
 qRIXS_SC_VVC_02(i_xExtILK_OK := , i_xOverrideMode := xSystemOverrideMode, iq_stValve => );
 
-//VGC Valves 
-///VGC on Beamline 
+//VGC Valves
+///VGC on Beamline
 qRIXS_SC_VGC_01(
-	i_stUSG:= RIX_TV4K2_GFS_1.IG, 
-	i_stDSG:= qRIXS_SC_GCC_01.IG, 
-	i_xDis_DPIlk:= FALSE , 
-	i_xPMPS_OK:= TRUE , 
-	i_xEPS_OK:= TRUE, 
-	i_xExt_OK:= TRUE, 
-	i_xOverrideMode:= xSystemOverrideMode , 
-	i_xReset:= , 
-	i_xIsAperture:= FALSE, 
-	i_sDevName:= 'QRIX:SC:VGC:01', 
-	i_nTransitionRootID:= , 
-	iq_stValve=> , 
-	xMPS_OK=> , 
-	io_fbFFHWO:= GVL_PMPS.fbFastFaultOutput1 , 
-	fbArbiter:= GVL_PMPS.fbArbiter );
+    i_stUSG:= RIX_TV4K2_GFS_1.IG,
+    i_stDSG:= qRIXS_SC_GCC_01.IG,
+    i_xDis_DPIlk:= FALSE ,
+    i_xPMPS_OK:= TRUE ,
+    i_xEPS_OK:= TRUE,
+    i_xExt_OK:= TRUE,
+    i_xOverrideMode:= xSystemOverrideMode ,
+    i_xReset:= ,
+    i_xIsAperture:= FALSE,
+    i_sDevName:= 'QRIX:SC:VGC:01',
+    i_nTransitionRootID:= ,
+    iq_stValve=> ,
+    xMPS_OK=> ,
+    io_fbFFHWO:= GVL_PMPS.fbFastFaultOutput1 ,
+    fbArbiter:= GVL_PMPS.fbArbiter );
 
 qRIXS_SC_VGC_02(
-	i_stUSG:= qRIXS_SC_GCC_01.IG, 
-	i_stDSG:= RIX_IM5K2_PPM_GCC_1.IG, 
-	i_xDis_DPIlk:= FALSE , 
-	i_xPMPS_OK:= TRUE , 
-	i_xEPS_OK:= TRUE, 
-	i_xExt_OK:= TRUE, 
-	i_xOverrideMode:= xSystemOverrideMode , 
-	i_xReset:= , 
-	i_xIsAperture:= FALSE, 
-	i_sDevName:= 'QRIX:SC:VGC:02', 
-	i_nTransitionRootID:= , 
-	iq_stValve=> , 
-	xMPS_OK=> , 
-	io_fbFFHWO:= GVL_PMPS.fbFastFaultOutput1 , 
-	fbArbiter:= GVL_PMPS.fbArbiter );
-	
+    i_stUSG:= qRIXS_SC_GCC_01.IG,
+    i_stDSG:= RIX_IM5K2_PPM_GCC_1.IG,
+    i_xDis_DPIlk:= FALSE ,
+    i_xPMPS_OK:= TRUE ,
+    i_xEPS_OK:= TRUE,
+    i_xExt_OK:= TRUE,
+    i_xOverrideMode:= xSystemOverrideMode ,
+    i_xReset:= ,
+    i_xIsAperture:= FALSE,
+    i_sDevName:= 'QRIX:SC:VGC:02',
+    i_nTransitionRootID:= ,
+    iq_stValve=> ,
+    xMPS_OK=> ,
+    io_fbFFHWO:= GVL_PMPS.fbFastFaultOutput1 ,
+    fbArbiter:= GVL_PMPS.fbArbiter );
+
 //VRC 10
 qRIXS_SC_VRC_10.i_xExtILK_OK := qRIXS_SC_PTM_10.iq_stPTM.eState = E_PumpState.pumpRUNNING;
-(*F_TurboGateValve_Protection_ILK( i_Turbo := qRIXS_SC_PTM_10.iq_stPTM , 
-																   i_stISG := qRIXS_SC_GPI_01.PG, i_stBSG := qRIXS_ROUGH_GPI_11.PG,
-																	ScrollPump := qRIXS_PRO_01.stPump );
-*)														
+(*F_TurboGateValve_Protection_ILK( i_Turbo := qRIXS_SC_PTM_10.iq_stPTM ,
+                                                                   i_stISG := qRIXS_SC_GPI_01.PG, i_stBSG := qRIXS_ROUGH_GPI_11.PG,
+                                                                    ScrollPump := qRIXS_PRO_01.stPump );
+*)
 qRIXS_SC_VRC_10(i_xOverrideMode:=xSystemOverrideMode , iq_stValve=> );
 
 //VRC 20
-qRIXS_SC_VRC_20.i_xExtILK_OK := F_TurboGateValve_Protection_ILK( i_Turbo := qRIXS_SC_PTM_20.iq_stPTM , 
-																   i_stISG := qRIXS_SSL_GCP_20.PG, i_stBSG := qRIXS_ROUGH_GPI_11.PG,
-																	ScrollPump := qRIXS_PRO_01.stPump );
-																	
+qRIXS_SC_VRC_20.i_xExtILK_OK :=  qRIXS_SC_PTM_20.iq_stPTM.eState = E_PumpState.pumpRUNNING;
+(*F_TurboGateValve_Protection_ILK( i_Turbo := qRIXS_SC_PTM_20.iq_stPTM ,
+                                                                   i_stISG := qRIXS_SSL_GCP_20.PG, i_stBSG := qRIXS_ROUGH_GPI_11.PG,
+                                                                    ScrollPump := qRIXS_PRO_01.stPump );*)
+
 qRIXS_SC_VRC_20(i_xOverrideMode:=xSystemOverrideMode , iq_stValve=> );
 
 
 //VRC 30
-qRIXS_SC_VRC_30.i_xExtILK_OK := F_TurboGateValve_Protection_ILK( i_Turbo := qRIXS_SC_PTM_30.iq_stPTM , 
-																   i_stISG := qRIXS_SSL_GCP_30.PG, i_stBSG := qRIXS_ROUGH_GPI_11.PG,
-																	ScrollPump := qRIXS_PRO_01.stPump );
-																	
+qRIXS_SC_VRC_30.i_xExtILK_OK :=  qRIXS_SC_PTM_30.iq_stPTM.eState = E_PumpState.pumpRUNNING;
+(*F_TurboGateValve_Protection_ILK( i_Turbo := qRIXS_SC_PTM_30.iq_stPTM ,
+                                                                   i_stISG := qRIXS_SSL_GCP_30.PG, i_stBSG := qRIXS_ROUGH_GPI_11.PG,
+                                                                    ScrollPump := qRIXS_PRO_01.stPump );*)
+
 qRIXS_SC_VRC_30(i_xOverrideMode:=xSystemOverrideMode , iq_stValve=> );
 
 //PTM ILK
 //qRIXS_SC_PTM_10_ILK(i_stValve:=qRIXS_ROUGH_VRC_02.iq_stValve, i_stPump:=qRIXS_SC_PTM_10.iq_stPTM, tDelay:=T#200S, bILK=>);
-qRIXS_SC_PTM_10(i_xExtIlkOK:=(*qRIXS_SC_PTM_10_ILK.bILK 
-				AND *)F_TurboExtILKLogic_2(Turbo:=qRIXS_SC_PTM_10.iq_stPTM,BackingGauge:=qRIXS_ROUGH_GPI_02.PG, InletGauge:=qRIXS_SC_GPI_01.PG, ScrollPump:= qRIXS_PRO_01.stPump) );
+qRIXS_SC_PTM_10(i_xExtIlkOK:=(*qRIXS_SC_PTM_10_ILK.bILK
+                AND *)F_TurboExtILKLogic_2(Turbo:=qRIXS_SC_PTM_10.iq_stPTM,BackingGauge:=qRIXS_ROUGH_GPI_02.PG, InletGauge:=qRIXS_SC_GPI_01.PG, ScrollPump:= qRIXS_PRO_01.stPump) );
 
 //qRIXS_SC_PTM_20_ILK(i_stValve:=qRIXS_ROUGH_VRC_02.iq_stValve, i_stPump:=qRIXS_SC_PTM_20.iq_stPTM, tDelay:=T#200S, bILK=>);
-qRIXS_SC_PTM_20(i_xExtIlkOK:=(*qRIXS_SC_PTM_20_ILK.bILK 
-				AND *)F_TurboExtILKLogic_2(Turbo:=qRIXS_SC_PTM_20.iq_stPTM,BackingGauge:=qRIXS_ROUGH_GPI_02.PG, InletGauge:=qRIXS_SSL_GCP_20.PG, ScrollPump:= qRIXS_PRO_01.stPump) );
+qRIXS_SC_PTM_20(i_xExtIlkOK:=(*qRIXS_SC_PTM_20_ILK.bILK
+                AND *)F_TurboExtILKLogic_2(Turbo:=qRIXS_SC_PTM_20.iq_stPTM,BackingGauge:=qRIXS_ROUGH_GPI_02.PG, InletGauge:=qRIXS_SSL_GCP_20.PG, ScrollPump:= qRIXS_PRO_01.stPump) );
 
 //qRIXS_SC_PTM_30_ILK(i_stValve:=qRIXS_ROUGH_VRC_02.iq_stValve, i_stPump:=qRIXS_SC_PTM_30.iq_stPTM, tDelay:=T#200S, bILK=>);
-qRIXS_SC_PTM_30(i_xExtIlkOK:=(*qRIXS_SC_PTM_30_ILK.bILK 
-			AND*) F_TurboExtILKLogic_2(Turbo:=qRIXS_SC_PTM_30.iq_stPTM,BackingGauge:=qRIXS_ROUGH_GPI_02.PG, InletGauge:=qRIXS_SSL_GCP_30.PG, ScrollPump:= qRIXS_PRO_01.stPump) );
+qRIXS_SC_PTM_30(i_xExtIlkOK:=(*qRIXS_SC_PTM_30_ILK.bILK
+            AND*) F_TurboExtILKLogic_2(Turbo:=qRIXS_SC_PTM_30.iq_stPTM,BackingGauge:=qRIXS_ROUGH_GPI_02.PG, InletGauge:=qRIXS_SSL_GCP_30.PG, ScrollPump:= qRIXS_PRO_01.stPump) );
+
 
-			
 //Pfeiffer Turbo Serial
 
 
@@ -144,13 +146,13 @@ st_Pfeiffer_CTRL[1].iSerialAddress :=1;
 st_Pfeiffer_CTRL[1].xEnableComm := TRUE;
 st_Pfeiffer_CTRL[2].iSerialAddress :=2;
 st_Pfeiffer_CTRL[2].xEnableComm := TRUE;
-	
-(* Instanitate the Function block for serial communication with Pfeiffer*)	
+
+(* Instanitate the Function block for serial communication with Pfeiffer*)
 fb_PfeifferCom(astPfeifferControl := st_Pfeiffer_CTRL,
-			   astPfeifferStatus:= st_Pfeiffer_RBK,
-				SerialRXBuffer:= E2_SerialRXBuffer,
-				SerialTXBuffer:= E2_SerialTXBuffer);
-				
+               astPfeifferStatus:= st_Pfeiffer_RBK,
+                SerialRXBuffer:= E2_SerialRXBuffer,
+                SerialTXBuffer:= E2_SerialTXBuffer);
+
 
 (* Copy Status Pv's into the PTM structure*)
 qRIXS_SC_PTM_10.M_Serial_IO(st_Pfeiffer_CTRL:=st_Pfeiffer_CTRL[1],st_Pfeiffer_RBK:=st_Pfeiffer_RBK[1]);

diff --git a/lcls-plc-qrix-vac/lcls-plc-qrix-vac/_Config/IO/Device 1 (EtherCAT).xti b/lcls-plc-qrix-vac/lcls-plc-qrix-vac/_Config/IO/Device 1 (EtherCAT).xti
@@ -53,9 +53,21 @@
 		<Box File="qRIXS_PNL1_E0_EK1100.xti" Id="105">
 			<EtherCAT PortABoxInfo="#x02000038"/>
 		</Box>
-		<EtherCAT EnableVirtualSwitch="true" MaxSwitchPorts="2" MaxSwitchFrames="120">
+		<EtherCAT EnableVirtualSwitch="true" MaxSwitchPorts="3" MaxSwitchFrames="140">
 			<SyncUnit Name="Sample Chamber" NoDeleteIfUnused="true"/>
 			<SyncUnit Name="Spectrometer Arm" NoDeleteIfUnused="true"/>
 		</EtherCAT>
 	</Device>
+	<Mappings>
+		<OwnerA>
+			<OwnerB Name="TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EK1122_00_16^QRIX_MOT_INT (EL6692)">
+				<Link VarA="B950_233_WALL_S_DRL_04^EL1004_01_03^Channel 3^Input" VarB="IO Outputs^QRIX_VAC_VGC_03_OPEN_LIMIT_SWITCH"/>
+				<Link VarA="B950_233_WALL_S_DRL_04^EL1004_01_03^Channel 4^Input" VarB="IO Outputs^QRIX_VAC_VGC_03_CLOSED_LIMIT_SWITCH"/>
+			</OwnerB>
+			<OwnerB Name="TIID^Device 1 (EtherCAT)^B950_233_WALL_S_DRL_04^EL1004_01_03">
+				<Link VarA="B950_233_R03_DRL_01^EK1122_00_16^QRIX_MOT_INT (EL6692)^IO Outputs^QRIX_VAC_VGC_03_CLOSED_LIMIT_SWITCH" VarB="Channel 4^Input"/>
+				<Link VarA="B950_233_R03_DRL_01^EK1122_00_16^QRIX_MOT_INT (EL6692)^IO Outputs^QRIX_VAC_VGC_03_OPEN_LIMIT_SWITCH" VarB="Channel 3^Input"/>
+			</OwnerB>
+		</OwnerA>
+	</Mappings>
 </TcSmItem>
diff --git a/...vac/lcls-plc-qrix-vac/_Config/IO/Device 1 (EtherCAT)/B950_233_R03_DRL_01/EK1122_00_16.xti b/...vac/lcls-plc-qrix-vac/_Config/IO/Device 1 (EtherCAT)/B950_233_R03_DRL_01/EK1122_00_16.xti
@@ -10,5 +10,8 @@
 		<Box File="B950-310-WALL-W-DRL-02.xti" Id="79">
 			<EtherCAT PortABoxInfo="#x0300001f"/>
 		</Box>
+		<Box File="QRIX_MOT_INT (EL6692).xti" Id="92">
+			<EtherCAT PortABoxInfo="#x0100001f"/>
+		</Box>
 	</Box>
 </TcSmItem>