Merge branch 'master' of github.com:ghalym/lcls-plc-kfe-motion into s…

…l1k0-align # Conflicts: # plc-kfe-motion/kfe_motion/kfe_motion.tmc
pcdshub · Aug 16, 2024 · 9f2f4bc · 9f2f4bc
2 parents b497c55 + 8975612
commit 9f2f4bc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/plc-kfe-motion/_Config/NC/Axes/Axis 5 IM2K0-XTES-MMS.xti b/plc-kfe-motion/_Config/NC/Axes/Axis 5 IM2K0-XTES-MMS.xti
@@ -1464,7 +1464,7 @@ Drive Status 4 (manually linked):
 		</Drive>
 		<Controller Name="Ctrl" CtrType="2">
 			<CtrPara PriorControlFactor="1">
-				<PosDiffControl Range="1"/>
+				<PosDiffControl Range="1" Time="0.1"/>
 				<PID PosKp="20" PosExtKp="20" DeadBandPosition="0.001"/>
 				<Observer BandWidth="20"/>
 			</CtrPara>

diff --git a/plc-kfe-motion/_Config/NC/Axes/ST1K4-TEST.xti b/plc-kfe-motion/_Config/NC/Axes/ST1K4-TEST.xti
@@ -1462,7 +1462,7 @@ Drive Status 4 (manually linked):
 		</Drive>
 		<Controller Name="Ctrl" CtrType="1">
 			<CtrPara PriorControlFactor="1">
-				<PosDiffControl Range="0.1"/>
+				<PosDiffControl Range="0.2"/>
 				<Observer BandWidth="20"/>
 			</CtrPara>
 		</Controller>

diff --git a/plc-kfe-motion/kfe_motion/POUs/PRG_ST1K4_TEST.TcPOU b/plc-kfe-motion/kfe_motion/POUs/PRG_ST1K4_TEST.TcPOU
@@ -45,6 +45,7 @@ VAR
     {attribute 'TcLinkTo' := '.bFlowOk := TIIB[ST1K4-EL1004-E5]^Channel 1^Input'}
     fbFlowSwitch: FB_XTES_Flowswitch;
 
+
 END_VAR
 
 ]]></Declaration>
@@ -73,12 +74,13 @@ fbStates(
 
 bST3K4_in := PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.K_Stopper.ST3K4];
 
+
 IF bST3K4_auto THEN
     IF bST3K4_in AND eEnumGet <> E_EpicsInOut.IN THEN
         eEnumSet := ENUM_EpicsInOut.IN;
-    ELSIF NOT bST3K4_in AND eEnumGet <> E_EpicsInOut.OUT THEN
+{*    ELSIF NOT bST3K4_in AND eEnumGet <> E_EpicsInOut.OUT THEN
         eEnumSet := ENUM_EpicsInOut.OUT;
-    END_IF
+ *}   END_IF
 END_IF
 
 fbFlowSwitch();