Merge pull request #20 from tongju12/CVMIStandard

reverse back to CVMI standard
pcdshub · Sep 2, 2022 · fe13915 · fe13915
2 parents 9a253c9 + b62260d
commit fe13915
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 37 deletions.
diff --git a/plc-cvmi-vac/plc-cvmi-vac/plc_cvmi_vac/POUs/MAIN.TcPOU b/plc-cvmi-vac/plc-cvmi-vac/plc_cvmi_vac/POUs/MAIN.TcPOU
@@ -61,7 +61,7 @@ b_TurboPumpRunningFlag :=
 	(CVMI_GJ_PTM_04.iq_stPtm.eState = E_PumpState.pumpRUNNING) AND
 	//(CVMI_MAIN_PTM_01.iq_stPtm.i_xAtSpd) AND  There is currently no readback so Turbo pump state is not checked.
 	(CVMI_CATCH_PTM_01.iq_stPtm.i_xAtSpd) AND
-//	(CVMI_KTOF_PTM_01.iq_stPtm.i_xAtSpd) AND 
+	(CVMI_KTOF_PTM_01.iq_stPtm.i_xAtSpd) AND 
 //	(CVMI_KTOF_PTM_02.iq_stPtm.i_xAtSpd) AND  Currently not installed
 	(CVMI_ROUGH_PTM_01.iq_stPtm.i_xAtSpd);	
 TurboPumpTOF(IN:= b_TurboPumpRunningFlag, PT := TurboPumpDelayTime);
@@ -188,7 +188,7 @@ xHighVoltageSafteyLoopEnable:= (CVMI_CATCH_GCC_01.IG.rPRESS <= rHighVoltageMinPr
 					x_onBeamline:= xOnBeamline), 
 	iq_stPtm=> );
 	
-(*	CVMI_KTOF_PTM_01(
+	CVMI_KTOF_PTM_01(
 	i_xExtILKOk:= F_Turbo_NC_NO_Valve_Logic_NC(
 					i_stTurbo:= CVMI_KTOF_PTM_01.iq_stPtm, 
 					i_stISG:= CVMI_GJ_GPI_01.PG, 
@@ -201,7 +201,7 @@ xHighVoltageSafteyLoopEnable:= (CVMI_CATCH_GCC_01.IG.rPRESS <= rHighVoltageMinPr
 					iq_stRoughRoughValve_NC_second_xOpenLS:=xTMO_ROUGH2_VRC_01_OPEN_LS,
 					x_onBeamline:= xOnBeamline), 
 	iq_stPtm=> );
-*)
+
 (*
 	CVMI_KTOF_PTM_02(
 	i_xExtILKOk:= F_Turbo_NC_NO_Valve_Logic_NC(
@@ -254,14 +254,14 @@ fb_PfeifferCom_CVMI_ROUGH_PTM_01(astPfeifferControl := st_Pfeiffer_CTRL_CVMI_ROU
 							  SerialTXBuffer:= SerialTXBuffer_CVMI_ROUGH_PTM_01);
 CVMI_ROUGH_PTM_01.M_Serial_IO(st_Pfeiffer_RBK:= st_Pfeiffer_RBK_CVMI_ROUGH_PTM_01[1], st_Pfeiffer_CTRL:= st_Pfeiffer_CTRL_CVMI_ROUGH_PTM_01[1]);
 
-(*st_Pfeiffer_CTRL_CVMI_KTOF_PTM_01[1].iSerialAddress :=1;
+st_Pfeiffer_CTRL_CVMI_KTOF_PTM_01[1].iSerialAddress :=1;
 st_Pfeiffer_CTRL_CVMI_KTOF_PTM_01[1].xEnableComm := TRUE;
 fb_PfeifferCom_CVMI_KTOF_PTM_01(astPfeifferControl := st_Pfeiffer_CTRL_CVMI_KTOF_PTM_01,
 			   				  astPfeifferStatus:= st_Pfeiffer_RBK_CVMI_KTOF_PTM_01,
 							  SerialRXBuffer:= SerialRXBuffer_CVMI_KTOF_PTM_01,
 							  SerialTXBuffer:= SerialTXBuffer_CVMI_KTOF_PTM_01);
 CVMI_KTOF_PTM_01.M_Serial_IO(st_Pfeiffer_RBK:= st_Pfeiffer_RBK_CVMI_KTOF_PTM_01[1], st_Pfeiffer_CTRL:= st_Pfeiffer_CTRL_CVMI_KTOF_PTM_01[1]);
-*)
+
 (*
 st_Pfeiffer_CTRL_CVMI_KTOF_PTM_02[1].iSerialAddress :=1;
 st_Pfeiffer_CTRL_CVMI_KTOF_PTM_02[1].xEnableComm := TRUE;

diff --git a/plc-cvmi-vac/plc-cvmi-vac/plc_cvmi_vac/POUs/PRG_COM.TcPOU b/plc-cvmi-vac/plc-cvmi-vac/plc_cvmi_vac/POUs/PRG_COM.TcPOU
@@ -27,7 +27,7 @@ fbSerialLineControl_CVMI_ROUGH_PTM_01(
 	Error=> ,
 	ErrorID=> );
 	
-(* fbSerialLineControl_CVMI_KTOF_PTM_01(
+fbSerialLineControl_CVMI_KTOF_PTM_01(
 	Mode:= SERIALLINEMODE_EL6_22B,
 	pComIn:= ADR(stComIn_CVMI_KTOF_PTM_01),
 	pComOut:=ADR(stComOut_CVMI_KTOF_PTM_01),
@@ -36,7 +36,6 @@ fbSerialLineControl_CVMI_ROUGH_PTM_01(
 	RxBuffer:= SerialRXBuffer_CVMI_KTOF_PTM_01,
 	Error=> ,
 	ErrorID=> );
-*)
 
 (*
 fbSerialLineControl_CVMI_KTOF_PTM_02(

diff --git a/plc-cvmi-vac/plc-cvmi-vac/plc_cvmi_vac/plc_cvmi_vac.tmc b/plc-cvmi-vac/plc-cvmi-vac/plc_cvmi_vac/plc_cvmi_vac.tmc