ENH: Included interlock device name in VFS_Interface issue pcdshub#44

FIX: IO fields in some pragmas
ghalym · Jun 24, 2020 · 15fca40 · 15fca40
1 parent 1edd048
commit 15fca40
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 65 deletions.
diff --git a/L2SIVacuum/DUTs/Valves/ST_VGC.TcDUT b/L2SIVacuum/DUTs/Valves/ST_VGC.TcDUT
@@ -57,34 +57,34 @@ STRUCT
     pv: ERR_DifPres;
 	field: ZNAM NO ERROR ;
 	field: ONAM Diffrential error present ;
-	io: o;
+	io: i;
     '}
 	xERR_DifPres		: 	BOOL;
 	{attribute 'pytmc' := '
     pv: ERR_SP;
 	field: ZNAM NO ERROR ;
 	field: ONAM Setpoint error present ;
-	io: o;
+	io: i;
     '}
 	xERR_SP			: 	BOOL;
 	{attribute 'pytmc' := '
     pv: ERR_Ext;
 	field: ZNAM NO ERROR ;
 	field: ONAM External error present ;
-	io: o;
+	io: i;
     '}
 	xERR_ExtFault		: 	BOOL;
 	xAlmSum			: 	BOOL;
 	
 (*ILK Devices*)
 {attribute 'pytmc' := '
     pv: ILK_DEVICE_US;
-	io: o;
+	io: i;
     '}
 	sIlkUSDeviceName: STRING;
 	{attribute 'pytmc' := '
     pv: ILK_DEVICE_DS;
-	io: o;
+	io: i;
     '}
 	sIlkDSDeviceName: STRING;
 

diff --git a/L2SIVacuum/L2SIVacuum.tmc b/L2SIVacuum/L2SIVacuum.tmc
diff --git a/L2SIVacuum/POUs/Functions/Valves/Interfaces/FB_VFS_Interface.TcPOU b/L2SIVacuum/POUs/Functions/Valves/Interfaces/FB_VFS_Interface.TcPOU
@@ -15,7 +15,11 @@ VAR_IN_OUT
 
 END_VAR
 VAR
-
+	{attribute 'pytmc' := '
+    pv: GFS;
+	io: i;
+    '}	
+	sGFS: String;
 	(*outputs*)
 	q_xPRESS_OK AT%Q*: BOOL;
 	{attribute 'pytmc' := '
@@ -59,47 +63,49 @@ VAR
 	pv: TRIG; 
 	field: ZNAM TRIG_OFF; 
 	field: ONAM TRIG_ON;
-	io: io ;
+	io: i ;
 	'}
 	i_xTrigger AT %I* : BOOL;
 	{attribute 'pytmc' := '
 	pv: IS_OPEN; 
 	field: ZNAM NOT OPEN; 
 	field: ONAM OPEN;
-	io: io ;
+	io: i ;
 	'}
 	i_xVFS_Open AT %I* : BOOL;
 	{attribute 'pytmc' := '
 	pv: IS_CLOSED; 
 	field: ZNAM NOT CLOSED; 
 	field: ONAM CLOSE;
-	io: io ;
+	io: i ;
 	'}
 	i_xVFS_Closed AT %I* : BOOL;
 	{attribute 'pytmc' := '
 	pv: VAC_FAULT_OK; 
 	field: ZNAM FAULT ; 
 	field: ONAM FAULT OK;
-	io: io ;
+	io: i ;
 	'}
 	i_xVAC_FAULT_OK AT%I*: BOOL; (*Valve Vacuum OK, is set to False when there is Vacuum Fault*)
 	{attribute 'pytmc' := '
 	pv: FFO_OK; 
 	field: ZNAM FAULT ; 
 	field: ONAM FAULT OK;
-	io: io ;
+	io: i ;
 	'}
 	i_xMPS_OK AT%I*: BOOL;(*MPS Fault OK, is set when the Valve is Open and there is no trigger*)
 END_VAR]]></Declaration>
     <Implementation>
       <ST><![CDATA[(*soft IO Mapping*)
 
 q_xPRESS_OK := IG.xPRESS_OK;
+sGFS := IG.sPath;
 ]]></ST>
     </Implementation>
     <LineIds Name="FB_VFS_Interface">
       <LineId Id="68" Count="1" />
       <LineId Id="9" Count="0" />
+      <LineId Id="163" Count="0" />
       <LineId Id="71" Count="0" />
     </LineIds>
   </POU>