Merge pull request pcdshub#128 from tongju12/LI2K4-new-mirror

modifying li2k4 parameters for new mirror
tongju12 · Aug 13, 2024 · f2d0570 · f2d0570
2 parents 1b0c652 + 4cc703a
commit f2d0570
Show file tree

Hide file tree

Showing 5 changed files with 2,672 additions and 2,672 deletions.
diff --git a/plc-tmo-motion/_Config/NC/Axes/Axis 46 LI2K4-MMS-X.xti b/plc-tmo-motion/_Config/NC/Axes/Axis 46 LI2K4-MMS-X.xti
@@ -1324,8 +1324,8 @@ External Setpoint Generation:
 		</AxisPara>
 		<Encoder Name="Enc" EncType="29">
 			<EncPara ScaleFactorNumerator="5e-05" Offset="-214728.674" MaxCount="#xffffffff">
-				<SoftEndMinControl Enable="true" Range="-4"/>
-				<SoftEndMaxControl Enable="true" Range="1.5"/>
+				<SoftEndMinControl Range="-4"/>
+				<SoftEndMaxControl Range="1.5"/>
 				<Inc RefSoftSyncMask="#x0000ffff"/>
 			</EncPara>
 			<Vars VarGrpType="1">

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="{D35A4FBA-A1D6-D1F8-D559-116E09A79F07}">
+		<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tmo_motion\tmo_motion.tmc" TmcHash="{A51EA576-8248-980F-6098-1C92D2FCBEA6}">
 			<Name>tmo_motion Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 			<Vars VarGrpType="1">

diff --git a/plc-tmo-motion/plc-tmo-motion.tsproj b/plc-tmo-motion/plc-tmo-motion.tsproj
@@ -9,8 +9,8 @@
 					<TargetSelect TargetId="2">{57BD9670-089D-434A-85CF-90A857EE0EFF}</TargetSelect>
 					<TargetSelect TargetId="2">{66689887-CCBD-452C-AC9A-039D997C6E66}</TargetSelect>
 					<TargetSelect TargetId="2">{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</TargetSelect>
-					<TargetSelect TargetId="2">{E008E3C8-6BD9-491C-B673-DC45CC7AA4F1}</TargetSelect>
 					<TargetSelect TargetId="2">{520DE751-9DB6-47CB-8240-BD5C466E7E64}</TargetSelect>
+					<TargetSelect TargetId="2">{E008E3C8-6BD9-491C-B673-DC45CC7AA4F1}</TargetSelect>
 					<LicenseDevice DongleHardwareId="2" DongleDevice="#x03020003" DongleLevel="50" DongleSystemId="{48EB253C-818D-610A-0B70-DC68309EB817}"/>
 				</Target>
 			</Licenses>

diff --git a/plc-tmo-motion/tmo_motion/POUs/PRG_LI2K4_IP1.TcPOU b/plc-tmo-motion/tmo_motion/POUs/PRG_LI2K4_IP1.TcPOU
@@ -63,8 +63,8 @@ fbStateSetup(stPositionState:=stDefault, bSetDefault:=TRUE);
 fbStateSetup(stPositionState:=aLI2K4XStates[ENUM_LaserCoupling_States.OUT], fDelta := 0.5, sName := 'OUT', fPosition:=-0.75);
 
 fbStateSetup(stPositionState:=aLI2K4YStates[ENUM_LaserCoupling_States.OUT], fDelta := 0.5,  sName := 'OUT', fPosition:=133.0);
-fbStateSetup(stPositionState:=aLI2K4XStates[ENUM_LaserCoupling_States.Mirror1],fDelta := 1.5, sName := 'MIRROR1', fPosition:=-3.375);
-fbStateSetup(stPositionState:=aLI2K4YStates[ENUM_LaserCoupling_States.Mirror1],fDelta := 0.5, sName := 'MIRROR1', fPosition:=84.5);
+fbStateSetup(stPositionState:=aLI2K4XStates[ENUM_LaserCoupling_States.Mirror1],fDelta := 5.0, sName := 'MIRROR1', fPosition:=-3.375);
+fbStateSetup(stPositionState:=aLI2K4YStates[ENUM_LaserCoupling_States.Mirror1],fDelta := 5.0, sName := 'MIRROR1', fPosition:=84.5);
 
 aLI2K4YStates[ENUM_LaserCoupling_States.OUT].stPMPS.sPmpsState := 'LI2K4:IP1-OUT';
 aLI2K4YStates[ENUM_LaserCoupling_States.Mirror1].stPMPS.sPmpsState := 'LI2K4:IP1-MIRROR1';
@@ -73,6 +73,7 @@ aLI2K4XStates[ENUM_LaserCoupling_States.Mirror1].stPMPS.sPmpsState := 'LI2K4:IP1
 
 //LI2K4 EPS condition: OUT->In move Y then move X + IN->OUT move X thenm move Y
 //Y only can move up and down when X is OUT
+{*
 EPS_LI2K4Y_Positive(eps:=Main.M45.stEPSForwardEnable);
 EPS_LI2K4Y_Positive.setBit(nBits := 0, bValue:= Main.M46.stAxisStatus.fActPosition > -0.8 OR Main.M45.stAxisStatus.fActPosition < 85);
 EPS_LI2K4Y_Negative(eps:=Main.M45.stEPSBackwardEnable);
@@ -83,7 +84,7 @@ EPS_LI2K4X_Positive.setBit(nBits := 0, bValue:= Main.M45.stAxisStatus.fActPositi
 EPS_LI2K4X_Negative(eps:=Main.M46.stEPSBackwardEnable);
 EPS_LI2K4X_Negative.setBit(nBits := 0, bValue:= Main.M45.stAxisStatus.fActPosition < 85 OR Main.M46.stAxisStatus.fActPosition > -0.85);
 
-
+*}
 
 //LI2K4 sequenct move : OUT->IN Y move first and then X moves IN->OUT X moves first then Y