MNT: Renamed FFO terminal so that pragma link works

pcdshub · Sep 11, 2020 · 0893f66 · 0893f66
1 parent a69617f
commit 0893f66
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 32 deletions.
diff --git a/lcls-plc-tmo-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200).xti b/lcls-plc-tmo-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200).xti
@@ -7,7 +7,7 @@
 		<Name>__FILENAME__</Name>
 		<ImageId>1000</ImageId>
 		<EtherCAT PdiType="#x0100" CycleMBoxPollingTime="0" VendorId="#x00000002" ProductCode="#x04b02c52" RevisionNo="#x00001388" InfoDataState="false" PortPhys="49" MaxSlotCount="256" MaxSlotGroupCount="1" SlotPdoIncrement="1" SlotIndexIncrement="16" Type="EK1200-5000 EtherCAT Power supply (2A E-Bus)" Desc="EK1200"/>
-		<Box File="Term 2 (EL2202).xti" Id="2">
+		<Box File="PMPS_FFO.xti" Id="2">
 			<EtherCAT PortABoxInfo="#x01000001"/>
 		</Box>
 		<Box File="Term 3 (EL6070).xti" Id="3">

diff --git a/...rCAT)/Term 1 (EK1200)/Term 2 (EL2202).xti → ...1 (EtherCAT)/Term 1 (EK1200)/PMPS_FFO.xti b/...rCAT)/Term 1 (EK1200)/Term 2 (EL2202).xti → ...1 (EtherCAT)/Term 1 (EK1200)/PMPS_FFO.xti
diff --git a/lcls-plc-tmo-optics/_Config/PLC/tmo_optics.xti b/lcls-plc-tmo-optics/_Config/PLC/tmo_optics.xti
@@ -775,15 +775,15 @@ External Setpoint Generation:
 			</Relations>
 		</DataType>
 		<DataType>
-			<Name GUID="{2E853C62-3036-4BA7-B639-D50F90390A1B}" Namespace="lcls_twincat_motion" AutoDeleteType="true">EL5042_Status</Name>
+			<Name GUID="{9DE7F98D-C05E-401C-AB8D-B723144CA192}" Namespace="lcls_twincat_motion" AutoDeleteType="true">EL5042_Status</Name>
 			<BitSize>0</BitSize>
 			<BaseType GUID="{FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF}"/>
 			<Hides>
-				<Hide GUID="{8BE51F13-8C69-4457-9B8C-7AAEFA8EA66F}"/>
+				<Hide GUID="{2E853C62-3036-4BA7-B639-D50F90390A1B}"/>
 			</Hides>
 		</DataType>
 		<DataType>
-			<Name GUID="{41AC50A7-3F97-49FE-BC0A-07FE44BB32E0}" Namespace="lcls_twincat_motion" AutoDeleteType="true">ST_RenishawAbsEnc</Name>
+			<Name GUID="{CF2A5C34-1C74-4DD4-B1B4-CF39C019E75A}" Namespace="lcls_twincat_motion" AutoDeleteType="true">ST_RenishawAbsEnc</Name>
 			<Comment>
 				<![CDATA[ Renishaw BiSS-C absolute encoder used with an EL5042]]>
 			</Comment>
@@ -805,7 +805,7 @@ External Setpoint Generation:
 			</SubItem>
 			<SubItem>
 				<Name>Status</Name>
-				<Type GUID="{2E853C62-3036-4BA7-B639-D50F90390A1B}" Namespace="lcls_twincat_motion">EL5042_Status</Type>
+				<Type GUID="{9DE7F98D-C05E-401C-AB8D-B723144CA192}" Namespace="lcls_twincat_motion">EL5042_Status</Type>
 				<Comment>
 					<![CDATA[ Status struct placeholder]]>
 				</Comment>
@@ -822,7 +822,7 @@ External Setpoint Generation:
 				<BitOffs>64</BitOffs>
 			</SubItem>
 			<Hides>
-				<Hide GUID="{FF68C2CB-64D0-450D-80B9-1D538BC2D9EB}"/>
+				<Hide GUID="{41AC50A7-3F97-49FE-BC0A-07FE44BB32E0}"/>
 			</Hides>
 		</DataType>
 		<DataType>
@@ -1765,7 +1765,7 @@ External Setpoint Generation:
 					<Comment>
 						<![CDATA[ Encoders]]>
 					</Comment>
-					<Type GUID="{41AC50A7-3F97-49FE-BC0A-07FE44BB32E0}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{CF2A5C34-1C74-4DD4-B1B4-CF39C019E75A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -1787,7 +1787,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.M1K4.fbRunHOMS.stYdwnEnc</Name>
-					<Type GUID="{41AC50A7-3F97-49FE-BC0A-07FE44BB32E0}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{CF2A5C34-1C74-4DD4-B1B4-CF39C019E75A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -1809,7 +1809,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.M1K4.fbRunHOMS.stXupEnc</Name>
-					<Type GUID="{41AC50A7-3F97-49FE-BC0A-07FE44BB32E0}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{CF2A5C34-1C74-4DD4-B1B4-CF39C019E75A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -1831,7 +1831,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.M1K4.fbRunHOMS.stXdwnEnc</Name>
-					<Type GUID="{41AC50A7-3F97-49FE-BC0A-07FE44BB32E0}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{CF2A5C34-1C74-4DD4-B1B4-CF39C019E75A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -2054,13 +2054,16 @@ External Setpoint Generation:
 			</Vars>
 			<TaskPouOids>
 				<TaskPouOid Prio="1" OTCID="#x08502001"/>
-				<TaskPouOid Prio="20" OTCID="#x08502003"/>
 				<TaskPouOid Prio="3" OTCID="#x08502002"/>
+				<TaskPouOid Prio="20" OTCID="#x08502003"/>
 			</TaskPouOids>
 		</Instance>
 	</Project>
 	<Mappings>
 		<OwnerA Name="tmo_optics Instance">
+			<OwnerB Name="TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^PMPS_FFO">
+				<Link VarA="PlcTask Outputs^GVL_PMPS.g_FastFaultOutput1.q_xFastFaultOut" VarB="Channel 1^Output" AutoLink="true"/>
+			</OwnerB>
 			<OwnerB Name="TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^Term 5 (EK1122)^Term 6 (EK1100)^EL1004_M1K4_STO">
 				<Link VarA="PlcTask Inputs^Main.M1K4.fbRunHOMS.bSTOEnable1" VarB="Channel 1^Input" AutoLink="true"/>
 				<Link VarA="PlcTask Inputs^Main.M1K4.fbRunHOMS.bSTOEnable2" VarB="Channel 2^Input" AutoLink="true"/>

diff --git a/lcls-plc-tmo-optics/tmo_optics/tmo_optics.tmc b/lcls-plc-tmo-optics/tmo_optics/tmo_optics.tmc