Merge pull request #74 from ghalym/master

FIS: FB_GCM, FB_MKS909 and FB_Kashiyama
pcdshub · Feb 11, 2021 · 97766c9 · 97766c9
2 parents 2dda136 + bea8446
commit 97766c9
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 43 deletions.
diff --git a/L2SIVacuum/DUTs/Pumps/ST_KashiyamaDryPump.TcDUT b/L2SIVacuum/DUTs/Pumps/ST_KashiyamaDryPump.TcDUT
@@ -28,7 +28,8 @@ STRUCT
 	field: ONAM TRUE;
 	io: i
     '}
-	i_xLocal	:	BOOL;
+	i_xRemote	:	BOOL;
+
 	{attribute 'pytmc' := '
     pv: ALARM_OK;
 	field: ZNAM FALSE; 

diff --git a/L2SIVacuum/L2SIVacuum.tmc b/L2SIVacuum/L2SIVacuum.tmc
diff --git a/L2SIVacuum/LineIDs.dbg b/L2SIVacuum/LineIDs.dbg
diff --git a/L2SIVacuum/POUs/Functions/Gauges/FB_GCM.TcPOU b/L2SIVacuum/POUs/Functions/Gauges/FB_GCM.TcPOU
@@ -41,8 +41,10 @@ rV :=MAX((10*INT_TO_REAL(PG.i_iPRESS_R)/iTermBits),0);
 PG.rPRESS := (PG.rFULL_SCALE/10)*rV;
 IF PG.rPRESS > (rMinPressure)THEN
 	PG.xPRESS_OK := TRUE;
+	PG.eState := Valid; 
 ELSE
 	PG.xPRESS_OK := FALSE;
+	PG.eState := PressInvalid; 
 END_IF
 
 (*IO soft linking*)
@@ -63,18 +65,5 @@ END_VAR
         <ST><![CDATA[This^.iTermBits := TermBits;]]></ST>
       </Implementation>
     </Method>
-    <LineIds Name="FB_GCM">
-      <LineId Id="3" Count="9" />
-      <LineId Id="55" Count="0" />
-      <LineId Id="13" Count="5" />
-      <LineId Id="35" Count="2" />
-      <LineId Id="2" Count="0" />
-    </LineIds>
-    <LineIds Name="FB_GCM.ACT_IO">
-      <LineId Id="1" Count="0" />
-    </LineIds>
-    <LineIds Name="FB_GCM.M_SetBits">
-      <LineId Id="5" Count="0" />
-    </LineIds>
   </POU>
 </TcPlcObject>
diff --git a/L2SIVacuum/POUs/Functions/Gauges/FB_MKS909.TcPOU b/L2SIVacuum/POUs/Functions/Gauges/FB_MKS909.TcPOU
@@ -62,15 +62,15 @@ END_IF
 
 
 IF (PG.rPRESS <= IG.rPRO_SP)  AND (PG.xPRESS_OK) THEN
-		 IG.q_xHV_DIS := NOT IG.xHV_SW;
+		 IG.q_xHV_DIS := IG.xHV_SW;
 		 IG.xILKOk := TRUE;
 	ELSIF NOT IG.q_xHV_DIS AND timer.Q THEN
 		IF IG.rPRESS > (IG.rPRO_SP + IG.rHYS_PR) OR PG.rPRESS > (IG.rPRO_SP + IG.rHYS_PR) THEN
-		IG.q_xHV_DIS := TRUE;
+		IG.q_xHV_DIS := FALSE;
 		IG.xHV_SW := FALSE;
 		END_IF
 	ELSE 
-		IG.q_xHV_DIS := TRUE;
+		IG.q_xHV_DIS := FALSE;
 		IG.xHV_SW := FALSE;
 		IG.xILKOk := FALSE;
  	END_IF

diff --git a/L2SIVacuum/POUs/Functions/Pumps/FB_KashiyamaPump.TcPOU b/L2SIVacuum/POUs/Functions/Pumps/FB_KashiyamaPump.TcPOU
@@ -24,7 +24,7 @@ VAR
 	q_xLspdDo	AT%Q*: 	BOOL;
 	
 (* Input *)
-	i_xLocal	AT%I*:	BOOL;
+	i_xRemote	AT%I*:	BOOL;
 	i_xAlarm	AT%I*:	BOOL;
 	i_xWarning	AT%I*:	BOOL;
 	i_xIsRun	AT%I*:	BOOL;
@@ -33,7 +33,7 @@ END_VAR
     <Implementation>
       <ST><![CDATA[
 //Kashiyama Dry pump outputs at high level indicate no warning, no alarm and remotely
-q_stPump.xIlkOK := q_stPump.i_xLocal AND q_stPump.i_xWarningOK AND q_stPump.i_xAlarmOK;
+q_stPump.xIlkOK := q_stPump.i_xRemote AND q_stPump.i_xWarningOK AND q_stPump.i_xAlarmOK;
 
 IF q_stPump.xIlkOK THEN
 	q_stPump.q_xRunDO := q_stPump.pv_xRunSW;
@@ -86,7 +86,7 @@ ACT_IO();]]></ST>
 	q_xLspdDo := q_stPump.q_xLspdDo;;
 	
 (* Input *)
-	q_stPump.i_xLocal := i_xLocal;
+	q_stPump.i_xRemote := i_xRemote;
 	q_stPump.i_xAlarmOK :=	i_xAlarm;
 	q_stPump.i_xWarningOK :=	i_xWarning;
 	q_stPump.i_xIsRun :=	i_xIsRun;]]></ST>
@@ -103,24 +103,5 @@ END_VAR
 this^.q_stPump.pv_xRunSW := run;]]></ST>
       </Implementation>
     </Method>
-    <LineIds Name="FB_KashiyamaPump">
-      <LineId Id="67" Count="0" />
-      <LineId Id="20" Count="1" />
-      <LineId Id="66" Count="0" />
-      <LineId Id="22" Count="25" />
-      <LineId Id="63" Count="0" />
-      <LineId Id="102" Count="10" />
-      <LineId Id="96" Count="0" />
-      <LineId Id="64" Count="1" />
-      <LineId Id="9" Count="0" />
-    </LineIds>
-    <LineIds Name="FB_KashiyamaPump.ACT_IO">
-      <LineId Id="2" Count="8" />
-      <LineId Id="1" Count="0" />
-    </LineIds>
-    <LineIds Name="FB_KashiyamaPump.M_Run">
-      <LineId Id="10" Count="0" />
-      <LineId Id="5" Count="0" />
-    </LineIds>
   </POU>
 </TcPlcObject>
diff --git a/L2SIVacuum/Version/Global_Version.TcGVL b/L2SIVacuum/Version/Global_Version.TcGVL
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.3">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
   <GVL Name="Global_Version" Id="{b4103322-af4d-4358-8c01-a7ffb0bae992}">
     <Declaration><![CDATA[{attribute 'TcGenerated'}
 {attribute 'no-analysis'}
 {attribute 'linkalways'}
 // This function has been automatically generated from the project information.
 VAR_GLOBAL CONSTANT
 	{attribute 'const_non_replaced'}
-	stLibVersion_LCLS_Vacuum : ST_LibVersion := (iMajor := 0, iMinor := 0, iBuild := 0, iRevision := 0, nFlags := 0, sVersion := '0.0.0');
+	stLibVersion_LCLS_Vacuum : ST_LibVersion := (iMajor := 0, iMinor := 0, iBuild := 0, iRevision := 0, sVersion := '0.0.0');
 END_VAR
 ]]></Declaration>
   </GVL>