Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More work #17

Merged
merged 3 commits into from
Apr 19, 2024
Merged

More work #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fef649c
DEV: added QRIXS:SA:GC:02 gauge connected to cable L2J08172
ghalym Mar 19, 2024
c286fd5
FIX: Library versions
ghalym Mar 19, 2024
9ee889b
Dev: Adding devices and inl for PTM with rough VRC
ghalym Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 25 additions & 28 deletions lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{attribute 'pytmc' := ' pv: QRIXS:ROUGH:GPI:02 '}
{attribute 'TcLinkTo' := '.i_iPRESS_R := TIIB[EL3174_00_09]^AI Standard Channel 1^Value'}
qRIXS_ROUGH_GPI_02 : FB_MKS275;

Check warning on line 11 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Trailing whitespace 

Trailing whitespace
{attribute 'pytmc' := ' pv: QRIXS:ROUGH:GPI:11 '}
{attribute 'TcLinkTo' := '.i_iPRESS_R := TIIB[qRIXS_PNL1_E9_EL3174-0002]^AI Standard Channel 1^Value'}
qRIXS_ROUGH_GPI_11 : FB_MKS275;
Expand All @@ -22,12 +22,12 @@
// Gauges
//GCC
{attribute 'TcLinkTo' := ' .i_iPRESS_R := TIIB[EL3174-0002_01_23]^AI Standard Channel 1^Value;
.i_xHV_ON := TIIB[EL1124_01_22]^Channel 1^Input;

Check warning on line 25 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Leading tabs 

Leading tabs
.i_xDisc_Active := TIIB[EL1124_01_22]^Channel 2^Input;

Check warning on line 26 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Leading tabs 

Leading tabs
.q_xHV_DIS := TIIB[EL2624_01_18]^Channel 1^Output

Check warning on line 27 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Leading tabs 

Leading tabs
'}

Check warning on line 28 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Leading tabs 

Leading tabs

Check warning on line 28 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Trailing whitespace 

Trailing whitespace
{attribute 'pytmc' := '

Check warning on line 29 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Leading tabs 

Leading tabs
pv: QRIXS:SC:GCC:01 '}

Check warning on line 30 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Leading tabs 

Leading tabs
qRIXS_SC_GCC_01: FB_MKS500;
//GPI
{attribute 'pytmc' := ' pv: QRIXS:SC:GPI:01 '}
Expand All @@ -37,14 +37,21 @@
{attribute 'TcLinkTo' := '.i_iPRESS_R := TIIB[EL3174-0002_01_23]^AI Standard Channel 3^Value'}
qRIXS_ROUGH_GPI_31 : FB_MKS275;


(* MKS972 - Full range guage *)
{attribute 'TcLinkTo' := '.i_iPRESS_R := TIIB[EL3174-0002_02_13]^AI Standard Channel 2^Value'}
{attribute 'pytmc' := '
pv: QRIXS:SA:GCP:02

Check warning on line 43 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Leading tabs 

Leading tabs
io: io

Check warning on line 44 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Leading tabs 

Leading tabs
'}
qRIXS_SA_GCP_02: FB_972;

{attribute 'pytmc' := '
pv: QRIXS:SSL:GCP:20

Check warning on line 49 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Leading tabs 

Leading tabs
io: io
'}
{attribute 'TcLinkTo' := '.i_iPRESS_R := TIIB[EL3174-0002_01_24]^AI Standard Channel 1^Value'}
qRIXS_SSL_GCP_20: FB_972;

Check warning on line 54 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Trailing whitespace 

Trailing whitespace
{attribute 'pytmc' := '
pv: QRIXS:SSL:GCP:30
io: io
Expand All @@ -52,16 +59,16 @@
{attribute 'TcLinkTo' := '.i_iPRESS_R := TIIB[EL3174-0002_01_24]^AI Standard Channel 2^Value'}
qRIXS_SSL_GCP_30: FB_972;

{attribute 'pytmc' := ' pv: QRIXS:SDS:GCP:01 '}
{attribute 'TcLinkTo' := '.i_iPRESS_R := TIIB[EL3174-0002_02_13]^AI Standard Channel 1^Value'}
qRIXS_SDS_GCP_01 : FB_972;

//MKS-275

Check warning on line 66 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Trailing whitespace 

Trailing whitespace
{attribute 'pytmc' := ' pv: QRIXS:ROUGH:GPI:03 '}
{attribute 'TcLinkTo' := '.i_iPRESS_R := TIIB[EL3174-0002_02_13]^AI Standard Channel 2^Value'}
qRIXS_ROUGH_GPI_03 : FB_MKS275;

{attribute 'pytmc' := ' pv: QRIXS:ROUGH:GPI:04 '}
{attribute 'TcLinkTo' := '.i_iPRESS_R := TIIB[EL3174-0002_02_13]^AI Standard Channel 3^Value'}
qRIXS_ROUGH_GPI_04 : FB_MKS275;
{attribute 'pytmc' := ' pv: QRIXS:SDS:GPI:01 '}
{attribute 'TcLinkTo' := '.i_iPRESS_R := TIIB[EL3174-0002_02_13]^AI Standard Channel 1^Value'}
qRIXS_SDS_GPI_01 : FB_MKS275;




Expand All @@ -87,8 +94,8 @@
{attribute 'pytmc' := '
pv: QRIXS:SA:VRC:01
'}
qRIXS_SA_VRC_01 : FB_VRC_NO_FFO; // Is the Window valve NO

Check warning on line 97 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Trailing whitespace 

Trailing whitespace

Check warning on line 98 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Trailing whitespace 

Trailing whitespace

//// Connected to B950-310-WALL-W-DRL-02 (Mechanical Room )
{attribute 'pytmc' := ' pv: QRIXS:PRO:01 '}
Expand All @@ -98,10 +105,10 @@
.i_xBPStatus := TIIB[EL1088_03_01]^Channel 2^Input;
.i_xWarning := TIIB[EL1088_03_01]^Channel 3^Input;
.i_xAlarmOK := TIIB[EL1088_03_01]^Channel 4^Input;
.i_xRemote := TIIB (EL1088_03_01]^Channel 5^Input

Check warning on line 108 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Trailing whitespace 

Trailing whitespace
'}
qRIXS_PRO_01 : FB_EbaraDryPump;
{attribute 'pytmc' := ' pv: QRIXS:ROUGH:GPI:01 '}

Check warning on line 111 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Trailing whitespace 

Trailing whitespace
{attribute 'TcLinkTo' := '.i_iPRESS_R := TIIB[EL3174-0002_03_07]^AI Standard Channel 4^Value'}
qRIXS_ROUGH_GPI_01 : FB_MKS275;

Expand Down Expand Up @@ -131,12 +138,7 @@
'}
{attribute 'pytmc' := ' pv: QRIX:SC:VRC:30 '}
qRIXS_SC_VRC_30 : FB_VRC;
{attribute 'TcLinkTo' := '.i_xOpnLS := TIIB[EL1004_01_09]^Channel 1^Input;
.i_xClsLS := TIIB[EL1004_01_09]^Channel 2^Input;
.q_xOPN_DO := TIIB[EL2004_01_10]^Channel 1^Output
'}
{attribute 'pytmc' := ' pv: QRIX:SC:VRC:31 '}
qRIXS_SC_VRC_31 : FB_VRC;

//VGC
{attribute 'TcLinkTo' := '.i_xOpnLS := TIIB[EL1004_01_07]^Channel 3^Input;
.i_xClsLS := TIIB[EL1004_01_07]^Channel 4^Input;
Expand All @@ -159,31 +161,27 @@
{attribute 'TcLinkTo' := '.i_xOpnLS := TIIB[EL1004_01_03]^Channel 3^Input;
.i_xClsLS := TIIB[EL1004_01_03]^Channel 4^Input;
.q_xOPN_DO := TIIB[EL2004_01_02]^Channel 4^Output;
.q_xCls_DO := TIIB[EL2004_01_02]^Channel 3^Output
.q_xCls_DO := TIIB[EL2004_01_10]^Channel 1^Output
'}
{attribute 'pytmc' := '
pv: QRIX:SC:VGC:03
io: io
'}
qRIXS_SC_VGC_03 : FB_VGC;
qRIXS_SC_VGC_03 : FB_VRC_DA;

{attribute 'TcLinkTo' := '.i_xOpnLS := TIIB[EL1004_01_05]^Channel 1^Input;
.i_xClsLS := TIIB[EL1004_01_05]^Channel 2^Input;
.q_xOPN_DO := TIIB[EL2004_01_04]^Channel 1^Output

Check warning on line 174 in lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_Devices.TcGVL

View workflow job for this annotation

GitHub Actions / standard / Style check / Trailing whitespace 

Trailing whitespace
'}
{attribute 'pytmc' := ' pv: QRIXS:SC:VGC:04 '}
qRIXS_SC_VGC_04 : FB_VGC;
{attribute 'pytmc' := ' pv: QRIXS:SC:VGC:05 '}
{attribute 'TcLinkTo' := '.i_xOpnLS := TIIB[EL1004_01_05]^Channel 3^Input;
.i_xClsLS := TIIB[EL1004_01_05]^Channel 4^Input;
.q_xOPN_DO := TIIB[EL2004_01_04]^Channel 2^Output
.q_xCLS_DO := TIIB[EL2004_01_04]^Channel 2^Output
'}
qRIXS_SC_VGC_05 : FB_VGC;
//VVC
{attribute 'TcLinkTo' := '.q_xOPN_DO := TIIB[qRIXS_PNL1_E1_EL1004]^Channel 1^Input }
{attribute 'pytmc' := ' pv: QRIXS:SC:VVC:01 '}
qRIXS_SC_VVC_01 : FB_VVC;
{attribute 'pytmc' := ' pv: QRIXS:SC:VVC:02 '}
qRIXS_SC_VVC_02 : FB_VVC;
qRIXS_SC_VGC_05 : FB_VRC_NO;

//PTM
{attribute 'TcLinkTo' := '.i_xAtSpd := TIIB[EL1004_01_13]^Channel 1^Input;
.i_xFaultNC := TIIB[EL1004_01_13]^Channel 3^Input;
Expand Down Expand Up @@ -263,11 +261,10 @@
'}
qRIXS_SC_PTM_30 : FB_PTM_Pfeiffer;
//PTM- Turbo Pump
{attribute 'TcLinkTo' := '.i_xAtSpd := TIIB[qRIXS_PLC_EP01_EP2338-0002]^Channel 1^Input;
.i_xFaultNC := TIIB[qRIXS_PLC_EP01_EP2338-0002]^Channel 2^Input;
.i_xRemote := TIIB[qRIXS_PLC_EP01_EP2338-0002]^Channel 3^Input;
.q_RunDO := TIIB[qRIXS_PLC_EP02_EP2624-0002]^Channel 1^Output;
.q_xReset := TIIB[qRIXS_PLC_EP02_EP2624-0002]^Channel 2^Output
{attribute 'TcLinkTo' := '.i_xAtSpd := TIIB[EL1004_02_08]^Channel 2^Input;
.i_xFaultNC := TIIB[EL1004_02_08]^Channel 1^Input;
.q_RunDO := TIIB[EL2794_02_09]^Channel 1^Output;
.q_xReset := TIIB[EL2794_02_09]^Channel 2^Output
'}
{attribute 'pytmc' := '
pv: QRIXS:SDS:PTM:10
Expand Down
2 changes: 1 addition & 1 deletion lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/GVLs/GVL_SA.TcGVL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ VAR_GLOBAL
pv: QRIXS:BLW:VRC:01
io: io
'}
qRIXS_SA_VWC_01: FB_VRC;
qRIXS_SA_VWC_01: FB_VGC;

{attribute 'TcLinkTo' := '.i_xOpnLS := TIIB[qRIXS_PNL1_E2_EL1004]^Channel 1^Input;
.i_xClsLS := TIIB[qRIXS_PNL1_E2_EL1004]^Channel 2^Input;
Expand Down
4 changes: 2 additions & 2 deletions lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/PLC_QRIX_VAC.plcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@
</ItemGroup>
<ItemGroup>
<PlaceholderResolution Include="LCLS General">
<Resolution>LCLS General, * (SLAC)</Resolution>
<Resolution>LCLS General, 2.10.0 (SLAC)</Resolution>
</PlaceholderResolution>
<PlaceholderResolution Include="LCLS Vacuum">
<Resolution>LCLS Vacuum, 2.3.0 (SLAC - LCLS)</Resolution>
</PlaceholderResolution>
<PlaceholderResolution Include="LCLSVacuumSerialDriverLib">
<Resolution>LCLSVacuumSerialDriverLib, * (SLAC - LCLS)</Resolution>
<Resolution>LCLSVacuumSerialDriverLib, 1.2.2 (SLAC - LCLS)</Resolution>
</PlaceholderResolution>
<PlaceholderResolution Include="PMPS">
<Resolution>PMPS, 2.1.0 (SLAC - LCLS)</Resolution>
Expand Down
Loading
Loading