Merge pull request #96 from jyin999/VAT590

Vat590
pcdshub · Mar 29, 2022 · e72f839 · e72f839
2 parents 0f355e7 + 4d088a2
commit e72f839
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 56 deletions.
diff --git a/L2SIVacuum/L2SIVacuum.plcproj b/L2SIVacuum/L2SIVacuum.plcproj
@@ -325,9 +325,6 @@
     <Compile Include="POUs\Functions\Pumps\functions\F_TurboExtILK_NO_1.TcPOU">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="POUs\Functions\Pumps\functions\F_TurboExtILK_TOF.TcPOU">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="POUs\Functions\Pumps\Interfaces\FB_PIP_Interface_In.TcPOU">
       <SubType>Code</SubType>
     </Compile>

diff --git a/L2SIVacuum/L2SIVacuum.tmc b/L2SIVacuum/L2SIVacuum.tmc
diff --git a/L2SIVacuum/POUs/Functions/Gauges/FB_901_ECAT.TcPOU b/L2SIVacuum/POUs/Functions/Gauges/FB_901_ECAT.TcPOU
@@ -31,15 +31,16 @@ END_VAR
 // no div by zero
 PG.rPRESS :=i_iPRESS_R;
 PG.xPRESS_OK := xPress_OK and NOT bWcstate ;
-IF xPress_OK THEN
+IF xPress_OK and NOT bWcstate THEN
 	PG.xPRESS_OK := TRUE;
 	PG.eState := Valid; //Press OK
-ELSIF xOverrange THEN
+ELSIF xOverrange and NOT bWcstate THEN
 	PG.xPRESS_OK := FALSE;
 	PG.eState := OoR;
-ELSIF xUnderrange THEN
+ELSIF xUnderrange and NOT bWcstate THEN
 	PG.xPRESS_OK := FALSE;
 	PG.eState := PressInvalid;
+
 END_IF
 
 
@@ -61,7 +62,12 @@ END_IF]]></ST>
     </Action>
     <Action Name="ACT_IO" Id="{afe7d8e6-827d-4f4d-895b-401bfcc2f6f0}">
       <Implementation>
-        <ST><![CDATA[PG.i_iPRESS_R := REAL_TO_INT(i_iPRESS_R);
+        <ST><![CDATA[
+IF PG.xPRESS_OK THEN
+  	PG.i_iPRESS_R := REAL_TO_INT(i_iPRESS_R);
+ELSE
+	PG.rPRESS := 0.0;
+END_IF
 PG.sPath := sPath;
 ]]></ST>
       </Implementation>
@@ -95,15 +101,21 @@ IF ePrevState <> PG.eState THEN
       </Implementation>
     </Action>
     <LineIds Name="FB_901_ECAT">
-      <LineId Id="3" Count="20" />
+      <LineId Id="3" Count="13" />
+      <LineId Id="49" Count="0" />
+      <LineId Id="17" Count="6" />
       <LineId Id="2" Count="0" />
     </LineIds>
     <LineIds Name="FB_901_ECAT.ACT_Init">
       <LineId Id="2" Count="4" />
       <LineId Id="1" Count="0" />
     </LineIds>
     <LineIds Name="FB_901_ECAT.ACT_IO">
-      <LineId Id="1" Count="2" />
+      <LineId Id="4" Count="1" />
+      <LineId Id="1" Count="0" />
+      <LineId Id="6" Count="1" />
+      <LineId Id="10" Count="0" />
+      <LineId Id="2" Count="1" />
     </LineIds>
     <LineIds Name="FB_901_ECAT.ACT_Logger">
       <LineId Id="2" Count="22" />

diff --git a/L2SIVacuum/POUs/Functions/Pumps/functions/F_TurboExtILK_TOF.TcPOU b/L2SIVacuum/POUs/Functions/Pumps/functions/F_TurboExtILK_TOF.TcPOU