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

MNT: update to pmps v2.0.0
pcdshub · Jun 16, 2021 · efd7b48 · efd7b48
2 parents 57e1670 + 7cdcfb1
commit efd7b48
Show file tree

Hide file tree

Showing 8 changed files with 13,503 additions and 5,851 deletions.
diff --git a/iocBoot/ioc-lfe-optics/lfe_optics.db b/iocBoot/ioc-lfe-optics/lfe_optics.db
diff --git a/iocBoot/ioc-lfe-optics/lfe_optics.db.archive b/iocBoot/ioc-lfe-optics/lfe_optics.db.archive
diff --git a/iocBoot/ioc-lfe-optics/load_plc_databases.cmd b/iocBoot/ioc-lfe-optics/load_plc_databases.cmd
@@ -1,3 +1,3 @@
-# Total records: 3312
-callbackSetQueueSize(8624)
+# Total records: 3752
+callbackSetQueueSize(9504)
 dbLoadRecords("lfe_optics.db", "PORT=ASYN_PLC,PREFIX=PLC:LFE:OPTICS:,IOCNAME=$(IOC),IOC=$(IOC)")
diff --git a/lcls-plc-lfe-optics/lcls-plc-lfe-optics.tsproj b/lcls-plc-lfe-optics/lcls-plc-lfe-optics.tsproj
@@ -13,7 +13,7 @@
 				</Target>
 			</Licenses>
 			<Tasks>
-				<Task Id="3" Priority="20" CycleTime="100000" AmsPort="350">
+				<Task Id="3" Priority="20" CycleTime="100000" AmsPort="350" DisableFpExceptions="true">
 					<Name>PlcTask</Name>
 				</Task>
 				<Task Id="6" Priority="3" CycleTime="10000" AmsPort="351" AdtTasks="true">

diff --git a/lcls-plc-lfe-optics/lfe_optics/GVLs/GVL_PMPS.TcGVL b/lcls-plc-lfe-optics/lfe_optics/GVLs/GVL_PMPS.TcGVL
@@ -8,13 +8,13 @@ VAR_GLOBAL
 		pv: PLC:LFE:OPTICS:FFO:01
 	'}
 	{attribute 'TcLinkTo' := '.q_xFastFaultOut:=TIIB[PMPS_FFO]^Channel 1^Output'}
-	g_FastFaultOutput1 : FB_HardwareFFOutput := (bAutoReset:=TRUE);
+	g_FastFaultOutput1 : FB_HardwareFFOutput := (bAutoReset:=TRUE, i_sNetID:='172.21.88.66.1.1');
 
 	{attribute 'pytmc' := '
 		pv: PLC:LFE:OPTICS:FFO:02
 	'}
 	{attribute 'TcLinkTo' := '.q_xFastFaultOut:=TIIB[PMPS_FFO]^Channel 2^Output'}
-	g_FastFaultOutput2 : FB_HardwareFFOutput := (bAutoReset:=TRUE);
+	g_FastFaultOutput2 : FB_HardwareFFOutput := (bAutoReset:=TRUE, i_sNetID:='172.21.88.66.1.1');
 
 	{attribute 'pytmc' := '
 		pv: PLC:LFE:OPTICS:ARB:01

diff --git a/lcls-plc-lfe-optics/lfe_optics/POUs/Main.TcPOU b/lcls-plc-lfe-optics/lfe_optics/POUs/Main.TcPOU
@@ -600,7 +600,7 @@ P_CoatingProtections();
 fbLogHandler();
 
 // PMPS
-GVL_PMPS.g_fbArbiter1.AddRequest(16#5, PMPS_GVL.cstFullBeam);
+GVL_PMPS.g_fbArbiter1.AddRequest(16#5, PMPS_GVL.cstFullBeam, 'LFE Optics');
 fbArbiterIO(Arbiter := GVL_PMPS.g_fbArbiter1, fbFFHWO := GVL_PMPS.g_FastFaultOutput1);
 GVL_PMPS.g_FastFaultOutput1.Execute(i_xVeto:=);
 GVL_PMPS.g_FastFaultOutput2.Execute(i_xVeto:=);

diff --git a/lcls-plc-lfe-optics/lfe_optics/lfe_optics.plcproj b/lcls-plc-lfe-optics/lfe_optics/lfe_optics.plcproj
@@ -164,22 +164,22 @@
     <LibraryReference Include="LCLS General,2.4.2,SLAC">
       <Namespace>LCLS_General</Namespace>
     </LibraryReference>
-    <LibraryReference Include="lcls-twincat-motion,1.5.0,SLAC">
+    <LibraryReference Include="lcls-twincat-motion,1.5.1,SLAC">
       <Namespace>lcls_twincat_motion</Namespace>
     </LibraryReference>
     <LibraryReference Include="lcls-twincat-optics,0.2.0,SLAC">
       <Namespace>lcls_twincat_optics</Namespace>
     </LibraryReference>
-    <LibraryReference Include="PMPS,1.0.0,SLAC - LCLS">
+    <LibraryReference Include="PMPS,2.0.0,SLAC - LCLS">
       <Namespace>PMPS</Namespace>
     </LibraryReference>
   </ItemGroup>
   <ItemGroup>
     <PlaceholderResolution Include="lcls-twincat-motion">
-      <Resolution>lcls-twincat-motion, 1.5.0 (SLAC)</Resolution>
+      <Resolution>lcls-twincat-motion, 1.5.1 (SLAC)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="PMPS">
-      <Resolution>PMPS, 1.0.0 (SLAC - LCLS)</Resolution>
+      <Resolution>PMPS, 2.0.0 (SLAC - LCLS)</Resolution>
     </PlaceholderResolution>
   </ItemGroup>
   <ItemGroup>

diff --git a/lcls-plc-lfe-optics/lfe_optics/lfe_optics.tmc b/lcls-plc-lfe-optics/lfe_optics/lfe_optics.tmc