Skip to content

Commit

Permalink
DEV: FIX pvs and GCC EP
Browse files Browse the repository at this point in the history
  • Loading branch information
@ghalym
ghalym committed Oct 24, 2023
1 parent a56d37f commit 365d842
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 164 deletions.
74 changes: 37 additions & 37 deletions lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/PLC_QRIX_VAC.tmc
View file

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/POUs/PRG_SPA.TcPOU
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ END_VAR
<Implementation>
<ST><![CDATA[
(* Gamma Ion Pump *)
qRIXS_OPT_PIP_01(i_stGauge:=qRIXS_OPT_GCC_01.IG, i_xOverrideMode:= xSystemOverrideMode);
qRIXS_DET_PIP_01(i_stGauge:=qRIXS_DET_GCC_01.IG, i_xOverrideMode:= xSystemOverrideMode);
qRIXS_OPT_PIP_01(i_stGauge:=qRIXS_OPT_GPI_01.PG, i_xOverrideMode:= xSystemOverrideMode);
qRIXS_DET_PIP_01(i_stGauge:=qRIXS_DET_GPI_01.PG, i_xOverrideMode:= xSystemOverrideMode);
(* Pirani MKS 275 Gauges *)
qRIXS_OPT_GPI_01(PG=>);
Expand All @@ -24,8 +24,10 @@ END_VAR
qRIXS_SA_GCP_01(PG=>);
(* Cold Cathode Gauges *)
qRIXS_OPT_GCC_01(PG:=qRIXS_OPT_GPI_01.PG, IG=>, bEP:=FALSE);
qRIXS_DET_GCC_01(PG:=qRIXS_DET_GPI_01.PG, IG=>, bEP:=FALSE);
qRIXS_OPT_GCC_01.M_SetBits(30518);
qRIXS_OPT_GCC_01(PG:=qRIXS_OPT_GPI_01.PG, IG=>, bEP:=TRUE);
qRIXS_DET_GCC_01.M_SetBits(30518);
qRIXS_DET_GCC_01(PG:=qRIXS_DET_GPI_01.PG, IG=>, bEP:=TRUE);
(* Normally Closed Vate Valve *)
//(*
Expand Down
244 changes: 122 additions & 122 deletions lcls-plc-qrix-vac/lcls-plc-qrix-vac/_Config/PLC/PLC_QRIX_VAC.xti
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,102 @@
<Name>PRG_2_PMPS.fbArbiterIO.xTxPDO_state</Name>
<Type>BIT</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_VGC_01.i_xOpnLS</Name>
<Comment>
<![CDATA[IO]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_VGC_01.i_xClsLS</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_SA_VWC_01.i_xOpnLS</Name>
<Comment>
<![CDATA[IO]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_SA_VWC_01.i_xClsLS</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_VRC_01.i_xOpnLS</Name>
<Comment>
<![CDATA[IO]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_VRC_01.i_xClsLS</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_GPI_01.i_iPRESS_R</Name>
<Comment>
<![CDATA[ input Pressure // Link to analog Input]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_GPI_01.i_iPRESS_R</Name>
<Comment>
<![CDATA[ input Pressure // Link to analog Input]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_SA_GCP_01.i_iPRESS_R</Name>
<Comment>
<![CDATA[ input Pressure // Link to analog Input]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_GCC_01.i_iPRESS_R</Name>
<Comment>
<![CDATA[ Controls and I/Os]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_GCC_01.i_xHV_ON</Name>
<Comment>
<![CDATA[ True when High Voltage is on // 'TcLinkTo' (EL1124) ^Input]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_GCC_01.i_xDisc_Active</Name>
<Comment>
<![CDATA[ Discharge Current Active // 'TcLinkTo' (EL1124) ^Input]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_GCC_01.i_iPRESS_R</Name>
<Comment>
<![CDATA[ Controls and I/Os]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_GCC_01.i_xHV_ON</Name>
<Comment>
<![CDATA[ True when High Voltage is on // 'TcLinkTo' (EL1124) ^Input]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_GCC_01.i_xDisc_Active</Name>
<Comment>
<![CDATA[ Discharge Current Active // 'TcLinkTo' (EL1124) ^Input]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_Devices.qRIXS_ROUGH_GPI_02.i_iPRESS_R</Name>
<Comment>
Expand Down Expand Up @@ -866,102 +962,6 @@
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_VGC_01.i_xOpnLS</Name>
<Comment>
<![CDATA[IO]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_VGC_01.i_xClsLS</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_SA_VWC_01.i_xOpnLS</Name>
<Comment>
<![CDATA[IO]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_SA_VWC_01.i_xClsLS</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_VRC_01.i_xOpnLS</Name>
<Comment>
<![CDATA[IO]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_VRC_01.i_xClsLS</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_GPI_01.i_iPRESS_R</Name>
<Comment>
<![CDATA[ input Pressure // Link to analog Input]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_GPI_01.i_iPRESS_R</Name>
<Comment>
<![CDATA[ input Pressure // Link to analog Input]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_SA_GCP_01.i_iPRESS_R</Name>
<Comment>
<![CDATA[ input Pressure // Link to analog Input]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_GCC_01.i_iPRESS_R</Name>
<Comment>
<![CDATA[ Controls and I/Os]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_GCC_01.i_xHV_ON</Name>
<Comment>
<![CDATA[ True when High Voltage is on // 'TcLinkTo' (EL1124) ^Input]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_GCC_01.i_xDisc_Active</Name>
<Comment>
<![CDATA[ Discharge Current Active // 'TcLinkTo' (EL1124) ^Input]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_GCC_01.i_iPRESS_R</Name>
<Comment>
<![CDATA[ Controls and I/Os]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_GCC_01.i_xHV_ON</Name>
<Comment>
<![CDATA[ True when High Voltage is on // 'TcLinkTo' (EL1124) ^Input]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_GCC_01.i_xDisc_Active</Name>
<Comment>
<![CDATA[ Discharge Current Active // 'TcLinkTo' (EL1124) ^Input]]>
</Comment>
<Type>BOOL</Type>
</Var>
</Vars>
<Vars VarGrpType="2">
<Name>PlcTask Outputs</Name>
Expand Down Expand Up @@ -1093,6 +1093,32 @@
</Comment>
</SubVar>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_VGC_01.q_xOPN_DO</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_SA_VWC_01.q_xOPN_DO</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_VRC_01.q_xOPN_DO</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_GCC_01.q_xHV_DIS</Name>
<Comment>
<![CDATA[ Enable High Voltage when True // 'TcLinkTo' (EP2624) ^Output]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_GCC_01.q_xHV_DIS</Name>
<Comment>
<![CDATA[ Enable High Voltage when True // 'TcLinkTo' (EP2624) ^Output]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_Devices.qRIXS_SC_GCC_01.q_xHV_DIS</Name>
<Comment>
Expand Down Expand Up @@ -1333,32 +1359,6 @@
<Name>GVL_PMPS.fbFastFaultOutput2.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_VGC_01.q_xOPN_DO</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_SA_VWC_01.q_xOPN_DO</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_VRC_01.q_xOPN_DO</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_GCC_01.q_xHV_DIS</Name>
<Comment>
<![CDATA[ Enable High Voltage when True // 'TcLinkTo' (EP2624) ^Output]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_DET_GCC_01.q_xHV_DIS</Name>
<Comment>
<![CDATA[ Enable High Voltage when True // 'TcLinkTo' (EP2624) ^Output]]>
</Comment>
<Type>BOOL</Type>
</Var>
</Vars>
<Vars VarGrpType="8">
<Name>PlcTask Retains</Name>
Expand Down
2 changes: 1 addition & 1 deletion lcls-plc-qrix-vac/lcls-plc-qrix-vac/lcls-plc-qrix-vac.tsproj
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4022.30">
<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4022.30" TcVersionFixed="true">
<Project ProjectGUID="{9C4D6FE4-BAD3-46FA-AB47-D8CA4E35364B}" TargetNetId="172.21.140.43.1.1" RelativeTargetNetId="true" RelativeIpAddresses="true" ShowHideConfigurations="#x306">
<System>
<Licenses>
Expand Down

0 comments on commit 365d842

Please sign in to comment.