Merge pull request #120 from nrwslac/flow-switch-implementation

EBD/FEE Flow Switch Readbacks
pcdshub · Dec 8, 2023 · eb1d955 · eb1d955
2 parents e7803f1 + 4eb9879
commit eb1d955
Show file tree

Hide file tree

Showing 23 changed files with 2,445 additions and 2,291 deletions.
diff --git a/.../IO/Device 1 (EtherCAT)/Power (EK1200)/PLC Junction 1 (EK1122)/X2 IM1K0-XTES (EK1100).xti b/.../IO/Device 1 (EtherCAT)/Power (EK1200)/PLC Junction 1 (EK1122)/X2 IM1K0-XTES (EK1100).xti
@@ -31,7 +31,7 @@
 		<Box File="IM1K0-EL6021.xti" Id="33">
 			<EtherCAT PortABoxInfo="#x01000020"/>
 		</Box>
-		<Box File="EBD-PCW-FSW-EL1004.xti" Id="168">
+		<Box File="IM1K0-EL1004.xti" Id="168">
 			<EtherCAT PortABoxInfo="#x01000021"/>
 		</Box>
 		<Box File="IM1K0-EL6002.xti" Id="34">

diff --git a/...M1K0-XTES (EK1100)/EBD-PCW-FSW-EL1004.xti → ...)/X2 IM1K0-XTES (EK1100)/IM1K0-EL1004.xti b/...M1K0-XTES (EK1100)/EBD-PCW-FSW-EL1004.xti → ...)/X2 IM1K0-XTES (EK1100)/IM1K0-EL1004.xti
diff --git a/...ion 3 (EK1122)/X1 TMO FEE EC1 (EK1100)/TMO FEE EC1 E1 (EK1122)/X2-ST1K4-TEST (EK1100).xti b/...ion 3 (EK1122)/X1 TMO FEE EC1 (EK1100)/TMO FEE EC1 E1 (EK1122)/X2-ST1K4-TEST (EK1100).xti
@@ -19,13 +19,13 @@
 		<Box File="ST1K4-EL7041-E4.xti" Id="116">
 			<EtherCAT PortABoxInfo="#x01000073"/>
 		</Box>
-		<Box File="FEE-K-PCW-FSW-EL1004.xti" Id="240">
+		<Box File="ST1K4-EL1004-E5.xti" Id="240">
 			<EtherCAT PortABoxInfo="#x01000074"/>
 		</Box>
-		<Box File="ST1K4-EL5042-E5A.xti" Id="241">
+		<Box File="ST1K4-EL5042-E6.xti" Id="241">
 			<EtherCAT PortABoxInfo="#x010000f0"/>
 		</Box>
-		<Box File="ST1K4-EL9505-E5.xti" Id="117">
+		<Box File="ST1K4-EL9505-E7.xti" Id="117">
 			<EtherCAT PortABoxInfo="#x010000f1"/>
 		</Box>
 		<Box File="ST1K4-EL9011.xti" Id="118">

diff --git a/...K4-TEST (EK1100)/FEE-K-PCW-FSW-EL1004.xti → ...2-ST1K4-TEST (EK1100)/ST1K4-EL1004-E5.xti b/...K4-TEST (EK1100)/FEE-K-PCW-FSW-EL1004.xti → ...2-ST1K4-TEST (EK1100)/ST1K4-EL1004-E5.xti
diff --git a/...-ST1K4-TEST (EK1100)/ST1K4-EL5042-E5A.xti → ...2-ST1K4-TEST (EK1100)/ST1K4-EL5042-E6.xti b/...-ST1K4-TEST (EK1100)/ST1K4-EL5042-E5A.xti → ...2-ST1K4-TEST (EK1100)/ST1K4-EL5042-E6.xti
diff --git a/...2-ST1K4-TEST (EK1100)/ST1K4-EL9505-E5.xti → ...2-ST1K4-TEST (EK1100)/ST1K4-EL9505-E7.xti b/...2-ST1K4-TEST (EK1100)/ST1K4-EL9505-E5.xti → ...2-ST1K4-TEST (EK1100)/ST1K4-EL9505-E7.xti
diff --git a/plc-kfe-motion/_Config/NC/Axes/ST1K4-TEST.xti b/plc-kfe-motion/_Config/NC/Axes/ST1K4-TEST.xti
@@ -1530,7 +1530,7 @@ External Setpoint Generation:
 	</Axis>
 	<Mappings>
 		<OwnerA>
-			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 3 (EK1122)^X1 TMO FEE EC1 (EK1100)^TMO FEE EC1 E1 (EK1122)^X2-ST1K4-TEST (EK1100)^ST1K4-EL5042-E5A">
+			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 3 (EK1122)^X1 TMO FEE EC1 (EK1100)^TMO FEE EC1 E1 (EK1122)^X2-ST1K4-TEST (EK1100)^ST1K4-EL5042-E6">
 				<Link VarA="Enc^Inputs^In^nComState" VarB="WcState^InputToggle" Size="1" OffsA="1"/>
 				<Link VarA="Enc^Inputs^In^nComState" VarB="WcState^WcState"/>
 				<Link VarA="Enc^Inputs^In^nDataIn1" VarB="FB Inputs Channel 1^Position"/>

diff --git a/plc-kfe-motion/_Config/PLC/kfe_motion.xti b/plc-kfe-motion/_Config/PLC/kfe_motion.xti
@@ -1743,6 +1743,10 @@ External Setpoint Generation:
 					<Name>PRG_IM1K3_PPM.fbIM1K3.fbYagThermoCouple.iRaw</Name>
 					<Type>INT</Type>
 				</Var>
+				<Var>
+					<Name>PRG_IM1K3_PPM.fbIM1K3.fbFlowSwitch.bFlowOk</Name>
+					<Type>BOOL</Type>
+				</Var>
 				<Var>
 					<Name>PRG_IM2K0_XTES.fbIM2K0.fbYStage.fbDriveVirtual.MasterAxis.NcToPlc</Name>
 					<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
@@ -2129,6 +2133,10 @@ External Setpoint Generation:
 					<Name>PRG_PF1K0_WFS.fbPF1K0.fbThermoCouple2.iRaw</Name>
 					<Type>INT</Type>
 				</Var>
+				<Var>
+					<Name>PRG_PF1K0_WFS.fbPF1K0.fbFlowSwitch.bFlowOk</Name>
+					<Type>BOOL</Type>
+				</Var>
 				<Var>
 					<Name>PRG_RTDSK0.RTDSK0_MPA_01.i_xInsertedLS</Name>
 					<Comment>
@@ -4164,6 +4172,10 @@ External Setpoint Generation:
 					</Comment>
 					<Type>INT</Type>
 				</Var>
+				<Var>
+					<Name>PRG_ST1K4_TEST.fbFlowSwitch.bFlowOk</Name>
+					<Type>BOOL</Type>
+				</Var>
 				<Var>
 					<Name>PRG_3_PMPS_POST.fbArbiterIO.i_stCurrentBP</Name>
 					<Type GUID="{292CD354-C7C0-4A61-AAD0-1C85DD69646B}">ST_BeamParams_IO</Type>
@@ -7540,6 +7552,14 @@ External Setpoint Generation:
 					<Name>GVL.rReqTrans</Name>
 					<Type GUID="{6D319B26-4590-2152-3DE7-3BA9B629CA65}">ARRAY [1..16] OF ST_PMPS_Attenuator_IO</Type>
 				</Var>
+				<Var>
+					<Name>PRG_OTHER.fbPC1K0FlowSwitch.bFlowOk</Name>
+					<Type>BOOL</Type>
+				</Var>
+				<Var>
+					<Name>PRG_OTHER.fbPC1K4FlowSwitch.bFlowOk</Name>
+					<Type>BOOL</Type>
+				</Var>
 			</Vars>
 			<Vars VarGrpType="2">
 				<Name>PlcTask Outputs</Name>
@@ -8478,6 +8498,11 @@ External Setpoint Generation:
 				<Link VarA="PlcTask Outputs^PRG_RTDSK0.RTDSK0_MPA_04.q_xInsert_DO" VarB="Channel 7^Output" AutoLink="true"/>
 				<Link VarA="PlcTask Outputs^PRG_RTDSK0.RTDSK0_MPA_04.q_xRetract_DO" VarB="Channel 8^Output" AutoLink="true"/>
 			</OwnerB>
+			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 1 (EK1122)^X2 IM1K0-XTES (EK1100)^IM1K0-EL1004">
+				<Link VarA="PlcTask Inputs^PRG_IM1K0_XTES.fbIM1K0.fbFlowSwitch.bFlowOk" VarB="Channel 2^Input" AutoLink="true"/>
+				<Link VarA="PlcTask Inputs^PRG_OTHER.fbPC1K0FlowSwitch.bFlowOk" VarB="Channel 1^Input" AutoLink="true"/>
+				<Link VarA="PlcTask Inputs^PRG_SL1K0_POWER.fbSL1K0.fbFlowSwitch.bFlowOk" VarB="Channel 3^Input" AutoLink="true"/>
+			</OwnerB>
 			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 1 (EK1122)^X2 IM1K0-XTES (EK1100)^IM1K0-EL1088">
 				<Link VarA="PlcTask Inputs^Main.M2.bHome" VarB="Channel 2^Input" AutoLink="true"/>
 				<Link VarA="PlcTask Inputs^Main.M3.bHome" VarB="Channel 4^Input" AutoLink="true"/>
@@ -8630,6 +8655,11 @@ External Setpoint Generation:
 				<Link VarA="PlcTask Inputs^Main.M6.nRawEncoderUINT" VarB="ENC Status compact Channel 1^Counter value" AutoLink="true"/>
 				<Link VarA="PlcTask Inputs^Main.M7.nRawEncoderUINT" VarB="ENC Status compact Channel 2^Counter value" AutoLink="true"/>
 			</OwnerB>
+			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 2 (EK1122)^X2 SXR EC1 (EK1100)^EC1 E1 (EK1122)^X2 SL2K0-POWER (EK1100)^SL2K0-EL1004-E12">
+				<Link VarA="PlcTask Inputs^PRG_IM2K0_XTES.fbIM2K0.fbFlowSwitch.bFlowOk" VarB="Channel 1^Input" AutoLink="true"/>
+				<Link VarA="PlcTask Inputs^PRG_PF1K0_WFS.fbPF1K0.fbFlowSwitch.bFlowOk" VarB="Channel 1^Input" AutoLink="true"/>
+				<Link VarA="PlcTask Inputs^PRG_SL2K0_POWER.fbSL2K0.fbFlowSwitch.bFlowOk" VarB="Channel 1^Input" AutoLink="true"/>
+			</OwnerB>
 			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 2 (EK1122)^X2 SXR EC1 (EK1100)^EC1 E1 (EK1122)^X2 SL2K0-POWER (EK1100)^SL2K0-EL3202-E10">
 				<Link VarA="PlcTask Inputs^PRG_SL2K0_POWER.fbSL2K0.RTD_Bottom_1.bError" VarB="RTD Inputs Channel 1^Status^Error" AutoLink="true"/>
 				<Link VarA="PlcTask Inputs^PRG_SL2K0_POWER.fbSL2K0.RTD_Bottom_1.iRaw" VarB="RTD Inputs Channel 1^Value" AutoLink="true"/>
@@ -8814,10 +8844,16 @@ External Setpoint Generation:
 				<Link VarA="PlcTask Inputs^Main.M31.nRawEncoderUINT" VarB="ENC Status compact Channel 1^Counter value" AutoLink="true"/>
 				<Link VarA="PlcTask Inputs^Main.M32.nRawEncoderUINT" VarB="ENC Status compact Channel 2^Counter value" AutoLink="true"/>
 			</OwnerB>
+			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 3 (EK1122)^X1 TMO FEE EC1 (EK1100)^TMO FEE EC1 E1 (EK1122)^X2-ST1K4-TEST (EK1100)^ST1K4-EL1004-E5">
+				<Link VarA="PlcTask Inputs^PRG_IM1K3_PPM.fbIM1K3.fbFlowSwitch.bFlowOk" VarB="Channel 3^Input" AutoLink="true"/>
+				<Link VarA="PlcTask Inputs^PRG_IM1K4_XTES.fbIM1K4.fbFlowSwitch.bFlowOk" VarB="Channel 2^Input" AutoLink="true"/>
+				<Link VarA="PlcTask Inputs^PRG_OTHER.fbPC1K4FlowSwitch.bFlowOk" VarB="Channel 2^Input" AutoLink="true"/>
+				<Link VarA="PlcTask Inputs^PRG_ST1K4_TEST.fbFlowSwitch.bFlowOk" VarB="Channel 1^Input" AutoLink="true"/>
+			</OwnerB>
 			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 3 (EK1122)^X1 TMO FEE EC1 (EK1100)^TMO FEE EC1 E1 (EK1122)^X2-ST1K4-TEST (EK1100)^ST1K4-EL2202-E3">
 				<Link VarA="PlcTask Outputs^Main.M33.bBrakeRelease" VarB="Channel 1^Output" AutoLink="true"/>
 			</OwnerB>
-			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 3 (EK1122)^X1 TMO FEE EC1 (EK1100)^TMO FEE EC1 E1 (EK1122)^X2-ST1K4-TEST (EK1100)^ST1K4-EL5042-E5A">
+			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 3 (EK1122)^X1 TMO FEE EC1 (EK1100)^TMO FEE EC1 E1 (EK1122)^X2-ST1K4-TEST (EK1100)^ST1K4-EL5042-E6">
 				<Link VarA="PlcTask Inputs^Main.M33.nRawEncoderULINT" VarB="FB Inputs Channel 1^Position" AutoLink="true"/>
 			</OwnerB>
 			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 3 (EK1122)^X1 TMO FEE EC1 (EK1100)^TMO FEE EC1 E1 (EK1122)^X2-ST1K4-TEST (EK1100)^ST1K4-EL7041-E4">

diff --git a/plc-kfe-motion/kfe_motion/GVLs/Main.TcGVL b/plc-kfe-motion/kfe_motion/GVLs/Main.TcGVL
@@ -194,7 +194,7 @@ VAR_GLOBAL
     {attribute 'TcLinkTo' := '.bLimitForwardEnable  := TIIB[ST1K4-EL7041-E4]^STM Status^Status^Digital input 1;
                               .bLimitBackwardEnable := TIIB[ST1K4-EL7041-E4]^STM Status^Status^Digital input 2;
                               .bBrakeRelease        := TIIB[ST1K4-EL2202-E3]^Channel 1^Output;
-                              .nRawEncoderULINT      := TIIB[ST1K4-EL5042-E5A]^FB Inputs Channel 1^Position'}
+                              .nRawEncoderULINT      := TIIB[ST1K4-EL5042-E6]^FB Inputs Channel 1^Position'}
     M33: ST_MotionStage := (sName := 'ST1K4:TEST:MMS:01');
 END_VAR]]></Declaration>
   </GVL>

diff --git a/plc-kfe-motion/kfe_motion/POUs/IM2K0/FB_XPIM_IM2K0.TcPOU b/plc-kfe-motion/kfe_motion/POUs/IM2K0/FB_XPIM_IM2K0.TcPOU
@@ -85,7 +85,7 @@ VAR
     fbLED: FB_XPIM_LED;
 
     {attribute 'pytmc' := '
-        pv: SFW
+        pv: FSW
     '}
     fbFlowSwitch: FB_XTES_Flowswitch;
 END_VAR

diff --git a/plc-kfe-motion/kfe_motion/POUs/PRG_1_PlcTask.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_1_PlcTask.TcPOU
@@ -18,6 +18,7 @@ PRG_SL2K0_POWER();
 PRG_AT1K4_SOLID();
 PRG_IM1K4_XTES();
 PRG_ST1K4_TEST();
+PRG_OTHER();
 
 PRG_3_PMPS_POST();
 PRG_4_LOG();]]></ST>

diff --git a/plc-kfe-motion/kfe_motion/POUs/PRG_IM1K0_XTES.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_IM1K0_XTES.TcPOU
@@ -9,7 +9,9 @@ VAR
                               .bFocusEndFwd := TIIB[IM1K0-EL1088]^Channel 3^Input;
                               .bFocusEndBwd := TIIB[IM1K0-EL1088]^Channel 4^Input;
                               .fbOpal.bOpalPower := TIIB[IM1K0-EL2004]^Channel 2^Output;
-                              .fbLED.bLedPower := TIIB[IM1K0-EL2004]^Channel 3^Output'}
+                              .fbLED.bLedPower := TIIB[IM1K0-EL2004]^Channel 3^Output;
+                              .fbFlowSwitch.bFlowOk := TIIB[IM1K0-EL1004]^Channel 2^Input
+'}
     fbIM1K0: FB_XPIM;
     fbStateSetup: FB_StateSetupHelper;
     stDefault: ST_PositionState := (

diff --git a/plc-kfe-motion/kfe_motion/POUs/PRG_IM1K3_PPM.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_IM1K3_PPM.TcPOU
@@ -14,7 +14,8 @@ VAR
                               .fbYagThermoCouple.bError := TIIB[IM1K3-EL3314]^TC Inputs Channel 2^Status^Error;
                               .fbYagThermoCouple.bUnderrange := TIIB[IM1K3-EL3314]^TC Inputs Channel 2^Status^Underrange;
                               .fbYagThermoCouple.bOverrange := TIIB[IM1K3-EL3314]^TC Inputs Channel 2^Status^Overrange;
-                              .fbYagThermoCouple.iRaw := TIIB[IM1K3-EL3314]^TC Inputs Channel 2^Value'}
+                              .fbYagThermoCouple.iRaw := TIIB[IM1K3-EL3314]^TC Inputs Channel 2^Value;
+                              .fbFlowSwitch.bFlowOk := TIIB[ST1K4-EL1004-E5]^Channel 3^Input'}
     fbIM1K3: FB_PPM;
     fbStateSetup: FB_StateSetupHelper;
     stDefault: ST_PositionState := (

diff --git a/plc-kfe-motion/kfe_motion/POUs/PRG_IM1K4_XTES.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_IM1K4_XTES.TcPOU
@@ -9,7 +9,8 @@ VAR
                               .bFocusEndFwd := TIIB[IM1K4-EL1088-E5]^Channel 3^Input;
                               .bFocusEndBwd := TIIB[IM1K4-EL1088-E5]^Channel 4^Input;
                               .fbOpal.bOpalPower := TIIB[IM1K4-EL2004-E2]^Channel 2^Output;
-                              .fbLED.bLedPower := TIIB[IM1K4-EL2004-E2]^Channel 3^Output'}
+                              .fbLED.bLedPower := TIIB[IM1K4-EL2004-E2]^Channel 3^Output;
+                              .fbFlowSwitch.bFlowOk := TIIB[ST1K4-EL1004-E5]^Channel 2^Input'} // same as PC1K4
     fbIM1K4: FB_XPIM;
     fbStateSetup: FB_StateSetupHelper;
     stDefault: ST_PositionState := (

diff --git a/plc-kfe-motion/kfe_motion/POUs/PRG_IM2K0_XTES.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_IM2K0_XTES.TcPOU
@@ -5,7 +5,8 @@
 VAR
     {attribute 'pytmc' := 'pv: IM2K0:XTES'}
     {attribute 'TcLinkTo' := '.fbLED.bLedPower := TIIB[IM2K0-EL2004]^Channel 3^Output;
-                              .fbGige.bGigePower := TIIB[IM2K0-EL2004]^Channel 4^Output'}
+                              .fbGige.bGigePower := TIIB[IM2K0-EL2004]^Channel 4^Output;
+                              .fbFlowSwitch.bFlowOk := TIIB[SL2K0-EL1004-E12]^Channel 1^Input'} // same cooling loop as SL2K0
     fbIM2K0: FB_XPIM_IM2K0;
     fbStateSetup: FB_StateSetupHelper;
     stDefault: ST_PositionState := (

diff --git a/plc-kfe-motion/kfe_motion/POUs/PRG_OTHER.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_OTHER.TcPOU
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
+  <POU Name="PRG_OTHER" Id="{404f3e80-89c9-4363-9ece-c8d5a2e49981}" SpecialFunc="None">
+    <Declaration><![CDATA[PROGRAM PRG_OTHER
+// A Program for implementing devices with minimal interaction.
+VAR
+    {attribute 'pytmc' := 'pv: PC1K0:XTES:FSW'}
+    {attribute 'TcLinkTo' := '.bFlowOk := TIIB[IM1K0-EL1004]^Channel 1^Input'}
+    fbPC1K0FlowSwitch : FB_XTES_Flowswitch;
+
+    {attribute 'pytmc' := 'pv: PC1K4:XTES:FSW'}
+    {attribute 'TcLinkTo' := '.bFlowOk := TIIB[ST1K4-EL1004-E5]^Channel 2^Input'}
+    fbPC1K4FlowSwitch : FB_XTES_Flowswitch;
+END_VAR
+]]></Declaration>
+    <Implementation>
+      <ST><![CDATA[fbPC1K0FlowSwitch();
+fbPC1K4FlowSwitch();]]></ST>
+    </Implementation>
+  </POU>
+</TcPlcObject>
diff --git a/plc-kfe-motion/kfe_motion/POUs/PRG_PF1K0_WFS.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_PF1K0_WFS.TcPOU
@@ -11,7 +11,8 @@ VAR
                               .fbThermoCouple2.bError := TIIB[PF1K0-EL3314]^TC Inputs Channel 2^Status^Error;
                               .fbThermoCouple2.bUnderrange := TIIB[PF1K0-EL3314]^TC Inputs Channel 2^Status^Underrange;
                               .fbThermoCouple2.bOverrange := TIIB[PF1K0-EL3314]^TC Inputs Channel 2^Status^Overrange;
-                              .fbThermoCouple2.iRaw := TIIB[PF1K0-EL3314]^TC Inputs Channel 2^Value'}
+                              .fbThermoCouple2.iRaw := TIIB[PF1K0-EL3314]^TC Inputs Channel 2^Value;
+                              .fbFlowSwitch.bFlowOk := TIIB[SL2K0-EL1004-E12]^Channel 1^Input'} // shares same cooling loop as SL2K0
     fbPF1K0: FB_WFS;
     fbStateSetup: FB_StateSetupHelper;
     stDefault: ST_PositionState := (

diff --git a/plc-kfe-motion/kfe_motion/POUs/PRG_SL1K0_POWER.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_SL1K0_POWER.TcPOU
@@ -39,8 +39,9 @@ VAR
                               .RTD_Bottom_2.bError := TIIB[SL1K0-EL3202-E9]^RTD Inputs Channel 2^Status^Error;
                               .RTD_Bottom_2.bUnderrange := TIIB[SL1K0-EL3202-E9]^RTD Inputs Channel 2^Status^Underrange;
                               .RTD_Bottom_2.bOverrange := TIIB[SL1K0-EL3202-E9]^RTD Inputs Channel 2^Status^Overrange;
-                              .AptArrayStatus := 'TIIB[PMPS_PRE]^IO Outputs^AptArrayStatus^AptArrayStatus[1];
-                              .AptArrayReq := 'TIIB[PMPS_PRE]^IO Inputs^AptArrayReq^AptArrayReq[1]'}
+                              .AptArrayStatus := TIIB[PMPS_PRE]^IO Outputs^AptArrayStatus^AptArrayStatus[1];
+                              .AptArrayReq := TIIB[PMPS_PRE]^IO Inputs^AptArrayReq^AptArrayReq[1];
+                              .fbFlowSwitch.bFlowOk := TIIB[IM1K0-EL1004]^Channel 3^Input'}
     fbSL1K0: FB_SLITS_POWER;
 //{attribute 'TcLinkTo' := 'TIIB[PMPS_PRE]^IO Outputs^AptArrayStatus'}
     {attribute 'pytmc' := '

diff --git a/plc-kfe-motion/kfe_motion/POUs/PRG_SL2K0_POWER.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_SL2K0_POWER.TcPOU
@@ -39,8 +39,9 @@ VAR
                               .RTD_Bottom_2.bError := TIIB[SL2K0-EL3202-E11]^RTD Inputs Channel 2^Status^Error;
                               .RTD_Bottom_2.bUnderrange := TIIB[SL2K0-EL3202-E11]^RTD Inputs Channel 2^Status^Underrange;
                               .RTD_Bottom_2.bOverrange := TIIB[SL2K0-EL3202-E11]^RTD Inputs Channel 2^Status^Overrange;
-                              .AptArrayStatus := 'TIIB[PMPS_PRE]^IO Outputs^AptArrayStatus^AptArrayStatus[2];
-                              .AptArrayReq := 'TIIB[PMPS_PRE]^IO Inputs^AptArrayReq^AptArrayReq[2]'}
+                              .AptArrayStatus := TIIB[PMPS_PRE]^IO Outputs^AptArrayStatus^AptArrayStatus[2];
+                              .AptArrayReq := TIIB[PMPS_PRE]^IO Inputs^AptArrayReq^AptArrayReq[2];
+                              .fbFlowSwitch.bFlowOk := TIIB[SL2K0-EL1004-E12]^Channel 1^Input'}
     fbSL2K0: FB_SLITS_POWER;
 //GET PMP Move Ok bit
 // Default True until it is properly linked to PMPS bit

diff --git a/plc-kfe-motion/kfe_motion/POUs/PRG_ST1K4_TEST.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_ST1K4_TEST.TcPOU
@@ -38,6 +38,13 @@ VAR
         io: io
     '}
     bST3K4_auto: BOOL := TRUE;
+
+    {attribute 'pytmc' := '
+        pv: ST1K4:TEST:FSW
+    '}
+    {attribute 'TcLinkTo' := '.bFlowOk := TIIB[ST1K4-EL1004-E5]^Channel 1^Input'}
+    fbFlowSwitch: FB_XTES_Flowswitch;
+
 END_VAR
 
 ]]></Declaration>
@@ -73,6 +80,8 @@ IF bST3K4_auto THEN
         eEnumSet := ENUM_EpicsInOut.OUT;
     END_IF
 END_IF
+
+fbFlowSwitch();
 ]]></ST>
     </Implementation>
   </POU>

diff --git a/plc-kfe-motion/kfe_motion/kfe_motion.plcproj b/plc-kfe-motion/kfe_motion/kfe_motion.plcproj
@@ -67,6 +67,9 @@
     <Compile Include="POUs\PRG_IM2K0_XTES.TcPOU">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="POUs\PRG_OTHER.TcPOU">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="POUs\PRG_PF1K0_WFS.TcPOU">
       <SubType>Code</SubType>
     </Compile>
@@ -159,7 +162,7 @@
       <Resolution>LCLS General, 2.9.1 (SLAC)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="lcls-twincat-common-components">
-      <Resolution>lcls-twincat-common-components, 3.0.1 (SLAC)</Resolution>
+      <Resolution>lcls-twincat-common-components, 3.3.0 (SLAC)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="lcls-twincat-motion">
       <Resolution>lcls-twincat-motion, 4.0.4 (SLAC)</Resolution>
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,7 +85,7 @@ VAR @@
         fbLED: FB_XPIM_LED;
         {attribute 'pytmc' := '
-            pv: SFW
+            pv: FSW
         '}
         fbFlowSwitch: FB_XTES_Flowswitch;
     END_VAR
@@ Expand Down @@