recovering sp1k4-att targets from 3 to 5 and setup new positions

tongju12 · Oct 10, 2024 · 3aa02f9 · 3aa02f9
1 parent f9120ce
commit 3aa02f9
Show file tree

Hide file tree

Showing 4 changed files with 2,694 additions and 2,688 deletions.
diff --git a/plc-tmo-motion/_Config/PLC/tmo_motion.xti b/plc-tmo-motion/_Config/PLC/tmo_motion.xti
@@ -1260,7 +1260,7 @@ External Setpoint Generation:
 		</DataType>
 	</DataTypes>
 	<Project GUID="{9DD0BA81-4A92-4D5E-8BD9-E101C02702D4}" Name="tmo_motion" PrjFilePath="..\..\tmo_motion\tmo_motion.plcproj" TmcFilePath="..\..\tmo_motion\tmo_motion.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-		<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tmo_motion\tmo_motion.tmc" TmcHash="{01998E45-AE8C-8282-BFDA-8DA67FF56E77}">
+		<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tmo_motion\tmo_motion.tmc" TmcHash="{AB843895-9D55-82CC-59D2-B7B5F13DFC54}">
 			<Name>tmo_motion Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 			<Vars VarGrpType="1">

diff --git a/plc-tmo-motion/tmo_motion/DUTs/ENUM_SolidAttenuator_States.TcDUT b/plc-tmo-motion/tmo_motion/DUTs/ENUM_SolidAttenuator_States.TcDUT
@@ -9,12 +9,13 @@ TYPE ENUM_SolidAttenuator_States :
     OUT := 1,
     Target1 := 2,
     Target2 := 3,
-    Target3 := 4
-//    Target4 := 5,
-//   Target5 := 6
+    Target3 := 4,
+    Target4 := 5,
+    Target5 := 6
 
 )UINT;
 END_TYPE
+
 ]]></Declaration>
   </DUT>
 </TcPlcObject>
diff --git a/plc-tmo-motion/tmo_motion/POUs/PRG_SP1K4.TcPOU b/plc-tmo-motion/tmo_motion/POUs/PRG_SP1K4.TcPOU
@@ -476,50 +476,48 @@ fbMotionFoilY(stMotionStage:=Main.M44);
 fbATTSetup(stPositionState:=fbATTDefault, bSetDefault:=TRUE);
 
 fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.OUT], sName:='OUT', fPosition:=11.0);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.OUT], sName:='OUT', fPosition:=-1.90);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.OUT], sName:='OUT', fPosition:=1.00);
 
-fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target1], sName:='TARGET1', fPosition:=36);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target1], sName:='TARGET1', fPosition:=-1.9);
+fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target1], sName:='TARGET1', fPosition:=36.5);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target1], sName:='TARGET1', fPosition:=2.2);
 
-fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target2], sName:='TARGET2', fPosition:=53);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target2], sName:='TARGET2', fPosition:=-1.9);
+fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target2], sName:='TARGET2', fPosition:=54.5);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target2], sName:='TARGET2', fPosition:=2.0);
 
-fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target3], sName:='TARGET3', fPosition:=71);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target3], sName:='TARGET3', fPosition:=-1.9);
-{*
-fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target4], sName:='TARGET4', fPosition:=88);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target4], sName:='TARGET4', fPosition:=-1.9);
+fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target3], sName:='TARGET3', fPosition:=72.2);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target3], sName:='TARGET3', fPosition:=1.6);
+
+fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target4], sName:='TARGET4', fPosition:=90.2);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target4], sName:='TARGET4', fPosition:=1.3);
 
-fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target5], sName:='TARGET5', fPosition:=107);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target5], sName:='TARGET5', fPosition:=-1.9); *}
+fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target5], sName:='TARGET5', fPosition:=107.8);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target5], sName:='TARGET5', fPosition:=1.0);
 
 aATTXStates[ENUM_SolidAttenuator_States.OUT].bMoveOk := TRUE;
 aATTXStates[ENUM_SolidAttenuator_States.Target1].bMoveOk := bPF1K4Out;
 aATTXStates[ENUM_SolidAttenuator_States.Target2].bMoveOk := bPF1K4Out;
 aATTXStates[ENUM_SolidAttenuator_States.Target3].bMoveOk := bPF1K4Out;
-{*
 aATTXStates[ENUM_SolidAttenuator_States.Target4].bMoveOk := bPF1K4Out;
 aATTXStates[ENUM_SolidAttenuator_States.Target5].bMoveOk := bPF1K4Out;
-*}
+
 
 aATTYStates[ENUM_SolidAttenuator_States.OUT].bMoveOk := TRUE;
 aATTYStates[ENUM_SolidAttenuator_States.Target1].bMoveOk := bPF1K4Out;
 aATTYStates[ENUM_SolidAttenuator_States.Target2].bMoveOk := bPF1K4Out;
 aATTYStates[ENUM_SolidAttenuator_States.Target3].bMoveOk := bPF1K4Out;
-{*
 aATTYStates[ENUM_SolidAttenuator_States.Target4].bMoveOk := bPF1K4Out;
 aATTYStates[ENUM_SolidAttenuator_States.Target5].bMoveOk := bPF1K4Out;
 
-*}
+
 
 
 
 aATTXStates[ENUM_SolidAttenuator_States.OUT].stPMPS.sPmpsState := 'SP1K4:ATT-OUT';
 aATTXStates[ENUM_SolidAttenuator_States.Target1].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET1';
 aATTXStates[ENUM_SolidAttenuator_States.Target2].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET2';
 aATTXStates[ENUM_SolidAttenuator_States.Target3].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET3';
-//aATTXStates[ENUM_SolidAttenuator_States.Target4].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET4';
-//aATTXStates[ENUM_SolidAttenuator_States.Target5].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET5';
+aATTXStates[ENUM_SolidAttenuator_States.Target4].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET4';
+aATTXStates[ENUM_SolidAttenuator_States.Target5].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET5';
 
 fbATTStates(
     stMotionStage1:=Main.M33,