From 0f51f028a541bd4c9bc3b65308d9a22af2e8b744 Mon Sep 17 00:00:00 2001 From: tongju12 Date: Thu, 29 Aug 2024 14:19:46 -0700 Subject: [PATCH] editing comment of li2k4 --- plc-tmo-motion/_Config/PLC/tmo_motion.xti | 2 +- .../tmo_motion/POUs/PRG_LI2K4_IP1.TcPOU | 7 +- plc-tmo-motion/tmo_motion/tmo_motion.tmc | 75 +++++++++++-------- 3 files changed, 50 insertions(+), 34 deletions(-) diff --git a/plc-tmo-motion/_Config/PLC/tmo_motion.xti b/plc-tmo-motion/_Config/PLC/tmo_motion.xti index 6a7225b..5c2c72e 100644 --- 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: - + tmo_motion Instance {08500001-0000-0000-F000-000000000064} diff --git a/plc-tmo-motion/tmo_motion/POUs/PRG_LI2K4_IP1.TcPOU b/plc-tmo-motion/tmo_motion/POUs/PRG_LI2K4_IP1.TcPOU index 86ba3dd..be34371 100644 --- a/plc-tmo-motion/tmo_motion/POUs/PRG_LI2K4_IP1.TcPOU +++ b/plc-tmo-motion/tmo_motion/POUs/PRG_LI2K4_IP1.TcPOU @@ -71,9 +71,10 @@ aLI2K4YStates[ENUM_LaserCoupling_States.Mirror1].stPMPS.sPmpsState := 'LI2K4:IP1 aLI2K4XStates[ENUM_LaserCoupling_States.OUT].stPMPS.sPmpsState := 'LI2K4:IP1-OUT'; aLI2K4XStates[ENUM_LaserCoupling_States.Mirror1].stPMPS.sPmpsState := 'LI2K4:IP1-MIRROR1'; -//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 - +(* The LI2K4 sequence mover is insteded to move as follows: + When moving from OUT to MIRROR1, first Y is moved, then once Y movement is complete, X is moved. +When moving from MIRROR1 to OUT, first X is moved, then once X movement is complete, Y is moved. +*) EPS_LI2K4Y_Positive(eps:=Main.M45.stEPSForwardEnable); EPS_LI2K4Y_Positive.setBit(nBits := 0, bValue:= Main.M46.stAxisStatus.fActPosition > -0.3 OR Main.M45.stAxisStatus.fActPosition < 82); EPS_LI2K4Y_Negative(eps:=Main.M45.stEPSBackwardEnable); diff --git a/plc-tmo-motion/tmo_motion/tmo_motion.tmc b/plc-tmo-motion/tmo_motion/tmo_motion.tmc index eeaf4af..38f2df0 100644 --- a/plc-tmo-motion/tmo_motion/tmo_motion.tmc +++ b/plc-tmo-motion/tmo_motion/tmo_motion.tmc @@ -1,5 +1,5 @@ - + ST_System @@ -19263,6 +19263,21 @@ contributing fast faults, unless the FFO is currently vetoed. + + USINT (USINT#1..255) + 8 + USINT + + + LowerBorder + 1 + + + UpperBorder + 255 + + + E_IPCDiag_Datatype parameter datatype 1..15 @@ -20871,7 +20886,7 @@ contributing fast faults, unless the FFO is currently vetoed. nParameterIdx - USINT (1..255) + USINT (USINT#1..255) 8 @@ -24732,7 +24747,7 @@ contributing fast faults, unless the FFO is currently vetoed. - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite) + UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite) 16 UINT @@ -24746,21 +24761,6 @@ contributing fast faults, unless the FFO is currently vetoed. - - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites) - 16 - UINT - - - LowerBorder - 1 - - - UpperBorder - 1000 - - - FB_AdsTestResultLogger @@ -24778,7 +24778,7 @@ contributing fast faults, unless the FFO is currently vetoed. PrintingTestSuiteResultNumber - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites) + UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites) 16 192 @@ -24816,12 +24816,12 @@ contributing fast faults, unless the FFO is currently vetoed. TestsInTestSuiteCounter - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite) + UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite) 16 MaxNumberOfTestsToPrint - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite) + UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite) 16 @@ -25754,7 +25754,7 @@ contributing fast faults, unless the FFO is currently vetoed. WritingTestSuiteResultNumber - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites) + UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites) 16 530752 @@ -26156,6 +26156,21 @@ contributing fast faults, unless the FFO is currently vetoed. + + UINT (1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite) + 16 + UINT + + + LowerBorder + 1 + + + UpperBorder + 100 + + + U_ExpectedOrActual 4096 @@ -27779,7 +27794,7 @@ contributing fast faults, unless the FFO is currently vetoed. NumberOfTestsToAnalyse - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites) + UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites) 16 @@ -29314,7 +29329,7 @@ contributing fast faults, unless the FFO is currently vetoed. NumberOfTestsToAnalyse - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites) + UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites) 16 @@ -29899,7 +29914,7 @@ contributing fast faults, unless the FFO is currently vetoed. NumberOfTestsToAnalyse - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites) + UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites) 16 @@ -30347,7 +30362,7 @@ contributing fast faults, unless the FFO is currently vetoed. NumberOfTestsToAnalyse - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites) + UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites) 16 @@ -30721,7 +30736,7 @@ contributing fast faults, unless the FFO is currently vetoed. NumberOfTestsToAnalyse - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites) + UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites) 16 @@ -100428,7 +100443,7 @@ second version of targets paddle 2 We do this by defining an array, in where we can see which current TEST_ORDERED() is the one to be handled right now. The below array is only used for TEST_ORDERED()-tests. 16000 - UINT (1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite) + UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite) 1 1000 @@ -104580,11 +104595,11 @@ second version of targets paddle 2 ChangeDate - 2024-08-28T15:32:09 + 2024-08-29T14:17:28 GeneratedCodeSize - 1228800 + 1282048 GlobalDataSize