Merge pull request #32 from ZLLentz/pmps-v2.0.0

MNT: update to pmps v2.0.0
pcdshub · Jun 16, 2021 · b9359ef · b9359ef
2 parents 878c7f8 + 99ac222
commit b9359ef
Show file tree

Hide file tree

Showing 9 changed files with 17,897 additions and 9,501 deletions.
diff --git a/HOMS_XRT/HOMS_XRT.tsproj b/HOMS_XRT/HOMS_XRT.tsproj
@@ -126,7 +126,7 @@
 				</Target>
 			</Licenses>
 			<Tasks>
-				<Task Id="2" Priority="20" CycleTime="100000" AmsPort="350">
+				<Task Id="2" Priority="20" CycleTime="100000" AmsPort="350" DisableFpExceptions="true">
 					<Name>PlcTask</Name>
 				</Task>
 				<Task Id="6" Priority="1" CycleTime="20000" AmsPort="351">

diff --git a/HOMS_XRT/HOMS_XRT_PLC/GVLs/GVL_PMPS.TcGVL b/HOMS_XRT/HOMS_XRT_PLC/GVLs/GVL_PMPS.TcGVL
@@ -7,13 +7,13 @@ VAR_GLOBAL
     pv: PLC:XRT:HOMS:FFO:01
     '}
     {attribute 'TcLinkTo' := '.q_xFastFaultOut:=TIIB[PMPS_FFO]^Channel 1^Output'}
-    g_FastFaultOutput1  :   FB_HardwareFFOutput;
+    g_FastFaultOutput1  :   FB_HardwareFFOutput := (i_sNetID:='172.21.88.66.1.1');
 	
 	{attribute 'pytmc' := '
     pv: PLC:XRT:HOMS:FFO:02
     '}
     {attribute 'TcLinkTo' := '.q_xFastFaultOut:=TIIB[PMPS_FFO]^Channel 2^Output'}
-    g_FastFaultOutput2  :   FB_HardwareFFOutput;
+    g_FastFaultOutput2  :   FB_HardwareFFOutput := (i_sNetID:='172.21.88.66.1.1');
 	
 	{attribute 'pytmc' := '
 	pv: PLC:XRT:HOMS:ARB:01

diff --git a/HOMS_XRT/HOMS_XRT_PLC/HOMS_XRT_PLC.plcproj b/HOMS_XRT/HOMS_XRT_PLC/HOMS_XRT_PLC.plcproj
@@ -364,13 +364,13 @@
   </ItemGroup>
   <ItemGroup>
     <PlaceholderResolution Include="lcls-twincat-motion">
-      <Resolution>lcls-twincat-motion, * (SLAC)</Resolution>
+      <Resolution>lcls-twincat-motion, 1.5.1 (SLAC)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="lcls-twincat-optics">
-      <Resolution>lcls-twincat-optics, * (SLAC)</Resolution>
+      <Resolution>lcls-twincat-optics, 0.2.1 (SLAC)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="PMPS">
-      <Resolution>PMPS, 1.0.0 (SLAC - LCLS)</Resolution>
+      <Resolution>PMPS, 2.0.0 (SLAC - LCLS)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="Tc2_ControllerToolbox">
       <Resolution>Tc2_ControllerToolbox, 3.4.1.4 (Beckhoff Automation GmbH)</Resolution>

diff --git a/HOMS_XRT/HOMS_XRT_PLC/HOMS_XRT_PLC.tmc b/HOMS_XRT/HOMS_XRT_PLC/HOMS_XRT_PLC.tmc
diff --git a/HOMS_XRT/HOMS_XRT_PLC/POUs/PRG_CoatingProtection.TcPOU b/HOMS_XRT/HOMS_XRT_PLC/POUs/PRG_CoatingProtection.TcPOU
@@ -98,7 +98,7 @@ ffM1M2IN(
 	    io_fbFFHWO:=GVL_PMPS.g_FastFaultOutput1);
 	
 // PMPS Arbiter and FFO instantiation.
-GVL_PMPS.g_fbArbiter1.AddRequest(16#5, PMPS_GVL.cstFullBeam);
+GVL_PMPS.g_fbArbiter1.AddRequest(16#5, PMPS_GVL.cstFullBeam, 'XRT HOMS');
 
 GVL_PMPS.fbArbiterIO.i_bVeto := PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.L_Stopper.ST1L0];
 GVL_PMPS.fbArbiterIO(Arbiter := GVL_PMPS.g_fbArbiter1, fbFFHWO := GVL_PMPS.g_FastFaultOutput1);

diff --git a/HOMS_XRT/_Config/PLC/HOMS_XRT_PLC.xti b/HOMS_XRT/_Config/PLC/HOMS_XRT_PLC.xti
@@ -775,15 +775,15 @@ External Setpoint Generation:
 			</Relations>
 		</DataType>
 		<DataType>
-			<Name GUID="{E9904FC3-EB4E-4601-8D33-910FD1554A54}" Namespace="lcls_twincat_motion" AutoDeleteType="true">EL5042_Status</Name>
+			<Name GUID="{FD448671-CF88-4E0A-A84B-C9398BFC0962}" Namespace="lcls_twincat_motion" AutoDeleteType="true">EL5042_Status</Name>
 			<BitSize>0</BitSize>
 			<BaseType GUID="{FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF}"/>
 			<Hides>
-				<Hide GUID="{87440095-DC14-4D30-94CA-7E1553B9539C}"/>
+				<Hide GUID="{E9904FC3-EB4E-4601-8D33-910FD1554A54}"/>
 			</Hides>
 		</DataType>
 		<DataType>
-			<Name GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion" AutoDeleteType="true">ST_RenishawAbsEnc</Name>
+			<Name GUID="{B6BF1E22-9A23-444C-92AB-20611A33BAEF}" 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="{E9904FC3-EB4E-4601-8D33-910FD1554A54}" Namespace="lcls_twincat_motion">EL5042_Status</Type>
+				<Type GUID="{FD448671-CF88-4E0A-A84B-C9398BFC0962}" 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="{6C6645C9-0783-4868-99D7-E55C2D2FE1B7}"/>
+				<Hide GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}"/>
 			</Hides>
 		</DataType>
 		<DataType>
@@ -2269,7 +2269,7 @@ External Setpoint Generation:
 					<Comment>
 						<![CDATA[ Encoders]]>
 					</Comment>
-					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{B6BF1E22-9A23-444C-92AB-20611A33BAEF}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -2291,7 +2291,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR1L3.fbRunHOMS.stYdwnEnc</Name>
-					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{B6BF1E22-9A23-444C-92AB-20611A33BAEF}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -2313,7 +2313,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR1L3.fbRunHOMS.stXupEnc</Name>
-					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{B6BF1E22-9A23-444C-92AB-20611A33BAEF}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -2335,7 +2335,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR1L3.fbRunHOMS.stXdwnEnc</Name>
-					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{B6BF1E22-9A23-444C-92AB-20611A33BAEF}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -3330,7 +3330,7 @@ External Setpoint Generation:
 					<Comment>
 						<![CDATA[ Encoders]]>
 					</Comment>
-					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{B6BF1E22-9A23-444C-92AB-20611A33BAEF}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -3352,7 +3352,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR2L3.fbRunHOMS.stYdwnEnc</Name>
-					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{B6BF1E22-9A23-444C-92AB-20611A33BAEF}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -3374,7 +3374,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR2L3.fbRunHOMS.stXupEnc</Name>
-					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{B6BF1E22-9A23-444C-92AB-20611A33BAEF}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -3396,7 +3396,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR2L3.fbRunHOMS.stXdwnEnc</Name>
-					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{B6BF1E22-9A23-444C-92AB-20611A33BAEF}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>