adding sp1k4 att limit

tongju12 · Aug 7, 2023 · 2ab11d1 · 2ab11d1
1 parent 5c126fe
commit 2ab11d1
Show file tree

Hide file tree

Showing 3 changed files with 77,244 additions and 757 deletions.
diff --git a/plc-tmo-motion/_Config/PLC/tmo_motion.xti b/plc-tmo-motion/_Config/PLC/tmo_motion.xti
@@ -9434,6 +9434,10 @@ External Setpoint Generation:
 				<Link VarA="PlcTask Inputs^Main.M36.bLimitBackwardEnable" VarB="STM Status^Status^Digital input 2" AutoLink="true"/>
 				<Link VarA="PlcTask Inputs^Main.M36.bLimitForwardEnable" VarB="STM Status^Status^Digital input 1" AutoLink="true"/>
 			</OwnerB>
+			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 2 (EK1122)^PLC Coupler 2 (EK1100)^PLC Junction 9 (EK1122)^SP1K4 Top Rail (EK1100)^FoilY-EL7041">
+				<Link VarA="PlcTask Inputs^Main.M44.bLimitBackwardEnable" VarB="STM Status^Status^Digital input 2" AutoLink="true"/>
+				<Link VarA="PlcTask Inputs^Main.M44.bLimitForwardEnable" VarB="STM Status^Status^Digital input 1" AutoLink="true"/>
+			</OwnerB>
 			<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 2 (EK1122)^PLC Coupler 2 (EK1100)^PLC Junction 9 (EK1122)^SP1K4 Top Rail (EK1100)^SP1K4-TL1-EL1124">
 				<Link VarA="PlcTask Inputs^PRG_SP1K4.bTL1High" VarB="Channel 1^Input" AutoLink="true"/>
 				<Link VarA="PlcTask Inputs^PRG_SP1K4.bTL1Low" VarB="Channel 2^Input" AutoLink="true"/>

diff --git a/plc-tmo-motion/tmo_motion/GVLs/Main.TcGVL b/plc-tmo-motion/tmo_motion/GVLs/Main.TcGVL
@@ -209,7 +209,7 @@ VAR_GLOBAL
         nEnableMode:=ENUM_StageEnableMode.DURING_MOTION); // Zone Plate Z
     {attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[YagX-EL7041]^STM Status^Status^Digital input 2;
                               .bLimitBackwardEnable:=TIIB[YagX-EL7041]^STM Status^Status^Digital input 1'}
-                              
+
     {attribute 'pytmc' := '
         pv: TMO:SPEC:MMS:06
     '}
@@ -265,26 +265,29 @@ VAR_GLOBAL
         bPowerSelf:=TRUE,
         nEnableMode:=ENUM_StageEnableMode.DURING_MOTION,
         nHomingMode := ENUM_EpicsHomeCmd.ABSOLUTE_SET); // Thorlabs2
-		
-	//thorlab-lenX
-	{attribute 'pytmc' := '
+
+    //thorlab-lenX
+    {attribute 'pytmc' := '
         pv: TMO:SPEC:MMS:12
     '}
     M43 : DUT_MotionStage := (
         bHardwareEnable:=TRUE,
         bPowerSelf:=TRUE,
         nEnableMode:=ENUM_StageEnableMode.DURING_MOTION,
-        nHomingMode := ENUM_EpicsHomeCmd.ABSOLUTE_SET); 
-	//FOIL-Y
-	{attribute 'pytmc' := '
+        nHomingMode := ENUM_EpicsHomeCmd.ABSOLUTE_SET);
+    //FOIL-Y
+    {attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[FoilY-EL7041]^STM Status^Status^Digital input 1;
+                              .bLimitBackwardEnable:=TIIB[FoilY-EL7041]^STM Status^Status^Digital input 2'}
+
+    {attribute 'pytmc' := '
         pv: TMO:SPEC:MMS:13
     '}
     M44 : DUT_MotionStage := (
         bHardwareEnable:=TRUE,
         bPowerSelf:=TRUE,
         nEnableMode:=ENUM_StageEnableMode.DURING_MOTION,
-        nHomingMode := ENUM_EpicsHomeCmd.ABSOLUTE_SET); 
-	
+        nHomingMode := ENUM_EpicsHomeCmd.ABSOLUTE_SET);
+
 END_VAR]]></Declaration>
   </GVL>
 </TcPlcObject>
diff --git a/plc-tmo-motion/tmo_motion/tmo_motion.tmc b/plc-tmo-motion/tmo_motion/tmo_motion.tmc