Skip to content

Commit

Permalink
DEV: Adding the SPC PIPs CRYO:01 and DET:03
Browse files Browse the repository at this point in the history
  • Loading branch information
@ghalym
ghalym committed Aug 29, 2024
1 parent d3b91a4 commit ddf0371
Show file tree
Hide file tree
Showing 5 changed files with 213 additions and 127 deletions.
22 changes: 22 additions & 0 deletions lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,28 @@ qRIXS_OPT_PIP_01: FB_PIP_Gamma;
qRIXS_DET_PIP_01: FB_PIP_Gamma;
{attribute 'pytmc' := '
pv: QRIXS:CRYO:PIP:01
io: io
'}
{attribute 'TcLinkTo' := '.q_xHVEna_DO := TIIB[EL2794_00_07]^Channel 3^Output;
.i_iPRESS := TIIB[EL3064_00_06]^AI Standard Channel 3^Value;
.i_xSP_DI := TIIB[EL1004_00_08]^Channel 3^Input
'}
qRIXS_CRYO_PIP_01: FB_PIP_Gamma;
{attribute 'pytmc' := '
pv: QRIXS:DET:PIP:03
io: io
'}
{attribute 'TcLinkTo' := '.q_xHVEna_DO := TIIB[EL2794_00_07]^Channel 4^Output;
.i_iPRESS := TIIB[EL3064_00_06]^AI Standard Channel 4^Value;
.i_xSP_DI := TIIB[EL1004_00_08]^Channel 4^Input
'}
qRIXS_DET_PIP_03: FB_PIP_Gamma;
END_VAR]]></Declaration>
</GVL>
Expand Down
232 changes: 122 additions & 110 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.

1 change: 1 addition & 0 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 @@ -15,6 +15,7 @@ END_VAR
(* 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_GPI_01.PG, i_xOverrideMode:= xSystemOverrideMode);
qRIXS_DET_PIP_03(i_stGauge:=qRIXS_DET_GPI_01.PG, i_xOverrideMode:= xSystemOverrideMode);

Check warning on line 18 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/POUs/PRG_SPA.TcPOU

View workflow job for this annotation

GitHub Actions / standard / Style check / Leading tabs 

Leading tabs
(* Pirani MKS 275 Gauges *)
qRIXS_OPT_GPI_01(PG=>);
Expand Down
5 changes: 4 additions & 1 deletion lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/POUs/PRG_SampleChamber.TcPOU
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ qRIXS_SA_GCP_02();
//ION Pumps
qRIXS_SC_PIP_01(i_stGauge:=qRIXS_SC_GPI_01.PG, i_xOverrideMode:= xSystemOverrideMode);
qRIXS_SC_PIP_02(i_stGauge:=qRIXS_SC_GPI_01.PG, i_xOverrideMode:= xSystemOverrideMode);
qRIXS_CRYO_PIP_01(i_stGauge:=qRIXS_SC_GPI_01.PG, i_xOverrideMode:= xSystemOverrideMode);
//Pfiffer Turbo
Expand Down Expand Up @@ -122,6 +123,8 @@ qRIXS_SC_VRC_30.i_xExtILK_OK := qRIXS_SC_PTM_30.iq_stPTM.eState = E_PumpState.p
qRIXS_SC_VRC_30(i_xOverrideMode:=xSystemOverrideMode , iq_stValve=> );
//Pfiffer Turbo
//PTM ILK
//qRIXS_SC_PTM_10_ILK(i_stValve:=qRIXS_ROUGH_VRC_02.iq_stValve, i_stPump:=qRIXS_SC_PTM_10.iq_stPTM, tDelay:=T#200S, bILK=>);
qRIXS_SC_PTM_10(i_xExtIlkOK:= qRIXS_ROUGH_VRC_02.M_IsOpen()
Expand Down
80 changes: 64 additions & 16 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 @@ -367,6 +367,10 @@
<Name>GVL_Interface.QRIX_MOT_SDS_MMS_H_FORWARD_EN</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_Interface.QRIX_MOT_SDS_MMS_H_BACKWARD_EN</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_2_PMPS.fbArbiterIO.i_stCurrentBP</Name>
<Type GUID="{292CD354-C7C0-4A61-AAD0-1C85DD69646B}">ST_BeamParams_IO</Type>
Expand Down Expand Up @@ -505,10 +509,6 @@
<Name>PRG_2_PMPS.fbArbiterIO.xTxPDO_state</Name>
<Type>BIT</Type>
</Var>
<Var>
<Name>GVL_Interface.QRIX_MOT_SDS_MMS_H_BACKWARD_EN</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_Devices.qRIXS_ROUGH_GPI_02.i_iPRESS_R</Name>
<Comment>
Expand Down Expand Up @@ -842,6 +842,28 @@
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_Devices.qRIXS_CRYO_PIP_01.i_iPRESS</Name>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_Devices.qRIXS_CRYO_PIP_01.i_xSP_DI</Name>
<Comment>
<![CDATA[ NO contact //function of relay set on the QPC to HV output state]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_Devices.qRIXS_DET_PIP_03.i_iPRESS</Name>
<Type>INT</Type>
</Var>
<Var>
<Name>GVL_Devices.qRIXS_DET_PIP_03.i_xSP_DI</Name>
<Comment>
<![CDATA[ NO contact //function of relay set on the QPC to HV output state]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_SA.qRIXS_OPT_VGC_01.i_xOpnLS</Name>
<Comment>
Expand Down Expand Up @@ -941,6 +963,10 @@
</Vars>
<Vars VarGrpType="2">
<Name>PlcTask Outputs</Name>
<Var>
<Name>PRG_SA_WINDOW.g_FastFaultOutputNA.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_2_PMPS.fbArbiterIO.q_stRequestedBP</Name>
<Type GUID="{292CD354-C7C0-4A61-AAD0-1C85DD69646B}">ST_BeamParams_IO</Type>
Expand Down Expand Up @@ -1238,6 +1264,28 @@
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_Devices.qRIXS_CRYO_PIP_01.q_xHVEna_DO</Name>
<Comment>
<![CDATA[ Enable High Voltage when TRUE]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_Devices.qRIXS_DET_PIP_03.q_xHVEna_DO</Name>
<Comment>
<![CDATA[ Enable High Voltage when TRUE]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_PMPS.fbFastFaultOutput1.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
<Var>
<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>
Expand All @@ -1264,18 +1312,6 @@
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_PMPS.fbFastFaultOutput1.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_PMPS.fbFastFaultOutput2.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SA_WINDOW.g_FastFaultOutputNA.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
</Vars>
<Vars VarGrpType="8">
<Name>PlcTask Retains</Name>
Expand Down Expand Up @@ -1651,6 +1687,10 @@
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_SC_PIP_01.i_xSP_DI" VarB="Channel 1^Input" AutoLink="true"/>
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_SC_PIP_02.i_xSP_DI" VarB="Channel 2^Input" AutoLink="true"/>
</OwnerB>
<OwnerB Name="TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EL1004_00_08">
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_CRYO_PIP_01.i_xSP_DI" VarB="Channel 3^Input" AutoLink="true"/>
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_DET_PIP_03.i_xSP_DI" VarB="Channel 4^Input" AutoLink="true"/>
</OwnerB>
<OwnerB Name="TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EL1004_00_12">
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_ROUGH_VRC_01.i_xClsLS" VarB="Channel 2^Input" AutoLink="true"/>
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_ROUGH_VRC_01.i_xOpnLS" VarB="Channel 1^Input" AutoLink="true"/>
Expand All @@ -1667,12 +1707,20 @@
<Link VarA="PlcTask Outputs^GVL_Devices.qRIXS_SC_PIP_01.q_xHVEna_DO" VarB="Channel 1^Output" AutoLink="true"/>
<Link VarA="PlcTask Outputs^GVL_Devices.qRIXS_SC_PIP_02.q_xHVEna_DO" VarB="Channel 2^Output" AutoLink="true"/>
</OwnerB>
<OwnerB Name="TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EL2794_00_07">
<Link VarA="PlcTask Outputs^GVL_Devices.qRIXS_CRYO_PIP_01.q_xHVEna_DO" VarB="Channel 3^Output" AutoLink="true"/>
<Link VarA="PlcTask Outputs^GVL_Devices.qRIXS_DET_PIP_03.q_xHVEna_DO" VarB="Channel 4^Output" AutoLink="true"/>
</OwnerB>
<OwnerB Name="TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EL3064_00_03">
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_DET_PIP_01.i_iPRESS" VarB="AI Standard Channel 4^Value" AutoLink="true"/>
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_OPT_PIP_01.i_iPRESS" VarB="AI Standard Channel 3^Value" AutoLink="true"/>
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_SC_PIP_01.i_iPRESS" VarB="AI Standard Channel 1^Value" AutoLink="true"/>
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_SC_PIP_02.i_iPRESS" VarB="AI Standard Channel 2^Value" AutoLink="true"/>
</OwnerB>
<OwnerB Name="TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EL3064_00_06">
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_CRYO_PIP_01.i_iPRESS" VarB="AI Standard Channel 3^Value" AutoLink="true"/>
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_DET_PIP_03.i_iPRESS" VarB="AI Standard Channel 4^Value" AutoLink="true"/>
</OwnerB>
<OwnerB Name="TIID^Device 1 (EtherCAT)^B950_233_R03_DRL_01^EL3174_00_09">
<Link VarA="PlcTask Inputs^GVL_Devices.qRIXS_ROUGH_GPI_02.i_iPRESS_R" VarB="AI Standard Channel 1^Value" AutoLink="true"/>
</OwnerB>
Expand Down

0 comments on commit ddf0371

Please sign in to comment.