ENH: add flowswitch readbacks for IM2K0, SL2K0, PF1K0

pcdshub · Oct 31, 2023 · 35745db · 35745db
1 parent 82fdcfe
commit 35745db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
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_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_SL2K0_POWER.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_SL2K0_POWER.TcPOU
@@ -40,7 +40,8 @@ VAR
                               .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]'}
+                              .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