Merge pull request #76 from jyotiphy/tm2k2_target

Changing setpoint for TM2K2 Target4 and fixing PF1K2 setpoint & limits
pcdshub · Nov 20, 2024 · 98981c9 · 98981c9
2 parents b85eca5 + b8fa19a
commit 98981c9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/plc-kfe-rix-motion/_Config/NC/Axes/Axis 12 PF1K2-WFS-MMS-Y.xti b/plc-kfe-rix-motion/_Config/NC/Axes/Axis 12 PF1K2-WFS-MMS-Y.xti
@@ -1354,7 +1354,6 @@ External Setpoint Generation:
 				<SoftEndMinControl Enable="true" Range="-94"/>
 				<SoftEndMaxControl Enable="true" Range="-9.71"/>
 				<Inc RefSoftSyncMask="#x0000ffff"/>
-				<ParameterChanged>13</ParameterChanged>
 			</EncPara>
 			<Vars VarGrpType="1">
 				<Name>Inputs</Name>

diff --git a/plc-kfe-rix-motion/_Config/PLC/kfe_rix_motion.xti b/plc-kfe-rix-motion/_Config/PLC/kfe_rix_motion.xti
@@ -1269,7 +1269,7 @@ External Setpoint Generation:
 		</DataType>
 	</DataTypes>
 	<Project GUID="{C31F67CF-3F03-4F49-935F-2494FCDDA958}" Name="kfe_rix_motion" PrjFilePath="..\..\kfe_rix_motion\kfe_rix_motion.plcproj" TmcFilePath="..\..\kfe_rix_motion\kfe_rix_motion.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-		<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="kfe_rix_motion\kfe_rix_motion.tmc" TmcHash="{ADD6A367-2A13-BD77-5A4A-CDAA94BB92CB}">
+		<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="kfe_rix_motion\kfe_rix_motion.tmc" TmcHash="{5E131CCC-A3A0-E958-9625-CC2213B587CD}">
 			<Name>kfe_rix_motion Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 			<Vars VarGrpType="1">

diff --git a/plc-kfe-rix-motion/kfe_rix_motion/POUs/PRG_PF1K2_WFS.TcPOU b/plc-kfe-rix-motion/kfe_rix_motion/POUs/PRG_PF1K2_WFS.TcPOU
@@ -28,7 +28,7 @@ END_VAR]]></Declaration>
       <ST><![CDATA[
 fbStateSetup(stPositionState:=stDefault, bSetDefault:=TRUE);
 
-fbStateSetup(stPositionState:=fbPF1K2.stOut, fPosition:=-13.00, sPmpsState:='PF1K2:WFS-OUT');
+fbStateSetup(stPositionState:=fbPF1K2.stOut, fPosition:=-13.80, sPmpsState:='PF1K2:WFS-OUT');
 fbStateSetup(stPositionState:=fbPF1K2.stTarget1, fPosition:=-94.00, sPmpsState:='PF1K2:WFS-TARGET1');
 fbStateSetup(stPositionState:=fbPF1K2.stTarget2, fPosition:=-82.755, sPmpsState:='PF1K2:WFS-TARGET2');
 fbStateSetup(stPositionState:=fbPF1K2.stTarget3, fPosition:=-68.38, sPmpsState:='PF1K2:WFS-TARGET3');

diff --git a/plc-kfe-rix-motion/kfe_rix_motion/POUs/PRG_TM2K2_ATM.TcPOU b/plc-kfe-rix-motion/kfe_rix_motion/POUs/PRG_TM2K2_ATM.TcPOU
@@ -28,7 +28,7 @@ fbStateSetup(stPositionState:=fbTM2K2.stOut, fPosition:=5.3, fDelta:=7, sPmpsSta
 fbStateSetup(stPositionState:=fbTM2K2.stTarget1, fPosition:=-15.5, fDelta:=7, sPmpsState:='TM2K2:ATM-TARGET1');
 fbStateSetup(stPositionState:=fbTM2K2.stTarget2, fPosition:=-36.5, fDelta:=7, sPmpsState:='TM2K2:ATM-TARGET2');
 fbStateSetup(stPositionState:=fbTM2K2.stTarget3, fPosition:=-52.0, fDelta:=7, sPmpsState:='TM2K2:ATM-TARGET3');
-fbStateSetup(stPositionState:=fbTM2K2.stTarget4, fPosition:=-60.5, fDelta:=7, sPmpsState:='TM2K2:ATM-TARGET4');
+fbStateSetup(stPositionState:=fbTM2K2.stTarget4, fPosition:=-61.50, fDelta:=7, sPmpsState:='TM2K2:ATM-TARGET4');
 fbStateSetup(stPositionState:=fbTM2K2.stTarget5, fPosition:=-77.0, fDelta:=7, sPmpsState:='TM2K2:ATM-TARGET5');
 fbStateSetup(stPositionState:=fbTM2K2.stTarget6, fPosition:=-96.6, fDelta:=7, sPmpsState:='TM2K2:ATM-TARGET6');
 

diff --git a/plc-kfe-rix-motion/kfe_rix_motion/kfe_rix_motion.tmc b/plc-kfe-rix-motion/kfe_rix_motion/kfe_rix_motion.tmc
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TcModuleClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2009/05/TcModuleClass" Hash="{ADD6A367-2A13-BD77-5A4A-CDAA94BB92CB}" GeneratedBy="TwinCAT XAE Plc">
+<TcModuleClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2009/05/TcModuleClass" Hash="{5E131CCC-A3A0-E958-9625-CC2213B587CD}" GeneratedBy="TwinCAT XAE Plc">
   <DataTypes>
     <DataType>
       <Name Namespace="LCLS_General">ST_System</Name>
@@ -110781,11 +110781,11 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
         </Property>
         <Property>
           <Name>ChangeDate</Name>
-          <Value>2024-11-07T13:59:31</Value>
+          <Value>2024-11-19T22:31:14</Value>
         </Property>
         <Property>
           <Name>GeneratedCodeSize</Name>
-          <Value>1150976</Value>
+          <Value>1208320</Value>
         </Property>
         <Property>
           <Name>GlobalDataSize</Name>