Skip to content
Snippets Groups Projects
Commit 779dcd42 authored by Karl Vestin's avatar Karl Vestin
Browse files

Merge branch 'ICSHWI-18207' into 'master' 

ICSHWI-18207: Add RFPS Driver FWD and B-Amp current PVs

Closes ICSHWI-18207

See merge request archiver-appliance/archiver-appliance-config-aa-linac-prod!194
parents bb9b30bb 88555728
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 60 additions and 40 deletions
files/Spk-010RFC_SC-IOC-010.archive → files/Spk-010RFC_SC-IOC-115.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-010RFC:RFS-RFPS-010:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-010RFC:RFS-RFPS-010:AmpAFilaVol-R
Spk-010RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-010RFC:RFS-RFPS-010:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-010RFC:RFS-RFPS-010:AmpBFilaVol-R Spk-010RFC:RFS-RFPS-010:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-010RFC:RFS-RFPS-010:AmpBFilaCur-R
Spk-010RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-010RFC:RFS-RFPS-010:AmpADrvFwdOut-R
\ No newline at end of file Spk-010RFC:RFS-RFPS-010:AmpBDrvFwdOut-R
files/Spk-010RFC_SC-IOC-020.archive → files/Spk-010RFC_SC-IOC-215.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-010RFC:RFS-RFPS-020:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-010RFC:RFS-RFPS-020:AmpAFilaVol-R
Spk-010RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-010RFC:RFS-RFPS-020:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-010RFC:RFS-RFPS-020:AmpBFilaVol-R Spk-010RFC:RFS-RFPS-020:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-010RFC:RFS-RFPS-020:AmpBFilaCur-R
Spk-010RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-010RFC:RFS-RFPS-020:AmpADrvFwdOut-R
Spk-010RFC:RFS-RFPS-020:AmpBDrvFwdOut-R
files/Spk-020RFC_SC-IOC-010.archive → files/Spk-020RFC_SC-IOC-115.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-020RFC:RFS-RFPS-010:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-020RFC:RFS-RFPS-010:AmpAFilaVol-R
Spk-020RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-020RFC:RFS-RFPS-010:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-020RFC:RFS-RFPS-010:AmpBFilaVol-R Spk-020RFC:RFS-RFPS-010:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-020RFC:RFS-RFPS-010:AmpBFilaCur-R
Spk-020RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-020RFC:RFS-RFPS-010:AmpADrvFwdOut-R
Spk-020RFC:RFS-RFPS-010:AmpBDrvFwdOut-R
files/Spk-020RFC_SC-IOC-020.archive → files/Spk-020RFC_SC-IOC-215.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-020RFC:RFS-RFPS-020:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-020RFC:RFS-RFPS-020:AmpAFilaVol-R
Spk-020RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-020RFC:RFS-RFPS-020:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-020RFC:RFS-RFPS-020:AmpBFilaVol-R Spk-020RFC:RFS-RFPS-020:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-020RFC:RFS-RFPS-020:AmpBFilaCur-R
Spk-020RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-020RFC:RFS-RFPS-020:AmpADrvFwdOut-R
Spk-020RFC:RFS-RFPS-020:AmpBDrvFwdOut-R
files/Spk-030RFC_SC-IOC-010.archive → files/Spk-030RFC_SC-IOC-115.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-030RFC:RFS-RFPS-010:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-030RFC:RFS-RFPS-010:AmpAFilaVol-R
Spk-030RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-030RFC:RFS-RFPS-010:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-030RFC:RFS-RFPS-010:AmpBFilaVol-R Spk-030RFC:RFS-RFPS-010:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-030RFC:RFS-RFPS-010:AmpBFilaCur-R
Spk-030RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-030RFC:RFS-RFPS-010:AmpADrvFwdOut-R
Spk-030RFC:RFS-RFPS-010:AmpBDrvFwdOut-R
files/Spk-030RFC_SC-IOC-020.archive → files/Spk-030RFC_SC-IOC-215.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-030RFC:RFS-RFPS-020:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-030RFC:RFS-RFPS-020:AmpAFilaVol-R
Spk-030RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-030RFC:RFS-RFPS-020:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-030RFC:RFS-RFPS-020:AmpBFilaVol-R Spk-030RFC:RFS-RFPS-020:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-030RFC:RFS-RFPS-020:AmpBFilaCur-R
Spk-030RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-030RFC:RFS-RFPS-020:AmpADrvFwdOut-R
Spk-030RFC:RFS-RFPS-020:AmpBDrvFwdOut-R
files/Spk-040RFC_SC-IOC-010.archive → files/Spk-040RFC_SC-IOC-115.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-040RFC:RFS-RFPS-010:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-040RFC:RFS-RFPS-010:AmpAFilaVol-R
Spk-040RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-040RFC:RFS-RFPS-010:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-040RFC:RFS-RFPS-010:AmpBFilaVol-R Spk-040RFC:RFS-RFPS-010:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-040RFC:RFS-RFPS-010:AmpBFilaCur-R
Spk-040RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-040RFC:RFS-RFPS-010:AmpADrvFwdOut-R
Spk-040RFC:RFS-RFPS-010:AmpBDrvFwdOut-R
files/Spk-040RFC_SC-IOC-020.archive → files/Spk-040RFC_SC-IOC-215.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-040RFC:RFS-RFPS-020:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-040RFC:RFS-RFPS-020:AmpAFilaVol-R
Spk-040RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-040RFC:RFS-RFPS-020:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-040RFC:RFS-RFPS-020:AmpBFilaVol-R Spk-040RFC:RFS-RFPS-020:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-040RFC:RFS-RFPS-020:AmpBFilaCur-R
Spk-040RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-040RFC:RFS-RFPS-020:AmpADrvFwdOut-R
Spk-040RFC:RFS-RFPS-020:AmpBDrvFwdOut-R
files/Spk-050RFC_SC-IOC-010.archive → files/Spk-050RFC_SC-IOC-115.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-050RFC:RFS-RFPS-010:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-050RFC:RFS-RFPS-010:AmpAFilaVol-R
Spk-050RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-050RFC:RFS-RFPS-010:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-050RFC:RFS-RFPS-010:AmpBFilaVol-R Spk-050RFC:RFS-RFPS-010:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-050RFC:RFS-RFPS-010:AmpBFilaCur-R
Spk-050RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-050RFC:RFS-RFPS-010:AmpADrvFwdOut-R
Spk-050RFC:RFS-RFPS-010:AmpBDrvFwdOut-R
files/Spk-050RFC_SC-IOC-020.archive → files/Spk-050RFC_SC-IOC-215.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-050RFC:RFS-RFPS-020:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-050RFC:RFS-RFPS-020:AmpAFilaVol-R
Spk-050RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-050RFC:RFS-RFPS-020:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-050RFC:RFS-RFPS-020:AmpBFilaVol-R Spk-050RFC:RFS-RFPS-020:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-050RFC:RFS-RFPS-020:AmpBFilaCur-R
Spk-050RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-050RFC:RFS-RFPS-020:AmpADrvFwdOut-R
Spk-050RFC:RFS-RFPS-020:AmpBDrvFwdOut-R
files/Spk-060RFC_SC-IOC-010.archive → files/Spk-060RFC_SC-IOC-115.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-060RFC:RFS-RFPS-010:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-060RFC:RFS-RFPS-010:AmpAFilaVol-R
Spk-060RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-060RFC:RFS-RFPS-010:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-060RFC:RFS-RFPS-010:AmpBFilaVol-R Spk-060RFC:RFS-RFPS-010:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-060RFC:RFS-RFPS-010:AmpBFilaCur-R
Spk-060RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-060RFC:RFS-RFPS-010:AmpADrvFwdOut-R
Spk-060RFC:RFS-RFPS-010:AmpBDrvFwdOut-R
files/Spk-060RFC_SC-IOC-020.archive → files/Spk-060RFC_SC-IOC-215.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-060RFC:RFS-RFPS-020:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-060RFC:RFS-RFPS-020:AmpAFilaVol-R
Spk-060RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-060RFC:RFS-RFPS-020:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-060RFC:RFS-RFPS-020:AmpBFilaVol-R Spk-060RFC:RFS-RFPS-020:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-060RFC:RFS-RFPS-020:AmpBFilaCur-R
Spk-060RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-060RFC:RFS-RFPS-020:AmpADrvFwdOut-R
Spk-060RFC:RFS-RFPS-020:AmpBDrvFwdOut-R
files/Spk-070RFC_SC-IOC-010.archive → files/Spk-070RFC_SC-IOC-115.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-070RFC:RFS-RFPS-010:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-070RFC:RFS-RFPS-010:AmpAFilaVol-R
Spk-070RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-070RFC:RFS-RFPS-010:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-070RFC:RFS-RFPS-010:AmpBFilaVol-R Spk-070RFC:RFS-RFPS-010:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-070RFC:RFS-RFPS-010:AmpBFilaCur-R
Spk-070RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-070RFC:RFS-RFPS-010:AmpADrvFwdOut-R
Spk-070RFC:RFS-RFPS-010:AmpBDrvFwdOut-R
files/Spk-070RFC_SC-IOC-020.archive → files/Spk-070RFC_SC-IOC-215.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-070RFC:RFS-RFPS-020:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-070RFC:RFS-RFPS-020:AmpAFilaVol-R
Spk-070RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-070RFC:RFS-RFPS-020:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-070RFC:RFS-RFPS-020:AmpBFilaVol-R Spk-070RFC:RFS-RFPS-020:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-070RFC:RFS-RFPS-020:AmpBFilaCur-R
Spk-070RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-070RFC:RFS-RFPS-020:AmpADrvFwdOut-R
Spk-070RFC:RFS-RFPS-020:AmpBDrvFwdOut-R
files/Spk-080RFC_SC-IOC-010.archive → files/Spk-080RFC_SC-IOC-115.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-080RFC:RFS-RFPS-010:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-080RFC:RFS-RFPS-010:AmpAFilaVol-R
Spk-080RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-080RFC:RFS-RFPS-010:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-080RFC:RFS-RFPS-010:AmpBFilaVol-R Spk-080RFC:RFS-RFPS-010:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-080RFC:RFS-RFPS-010:AmpBFilaCur-R
Spk-080RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-080RFC:RFS-RFPS-010:AmpADrvFwdOut-R
Spk-080RFC:RFS-RFPS-010:AmpBDrvFwdOut-R
files/Spk-080RFC_SC-IOC-020.archive → files/Spk-080RFC_SC-IOC-215.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-080RFC:RFS-RFPS-020:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-080RFC:RFS-RFPS-020:AmpAFilaVol-R
Spk-080RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-080RFC:RFS-RFPS-020:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-080RFC:RFS-RFPS-020:AmpBFilaVol-R Spk-080RFC:RFS-RFPS-020:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-080RFC:RFS-RFPS-020:AmpBFilaCur-R
Spk-080RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-080RFC:RFS-RFPS-020:AmpADrvFwdOut-R
Spk-080RFC:RFS-RFPS-020:AmpBDrvFwdOut-R
files/Spk-090RFC_SC-IOC-010.archive → files/Spk-090RFC_SC-IOC-115.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-090RFC:RFS-RFPS-010:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-090RFC:RFS-RFPS-010:AmpAFilaVol-R
Spk-090RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-090RFC:RFS-RFPS-010:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-090RFC:RFS-RFPS-010:AmpBFilaVol-R Spk-090RFC:RFS-RFPS-010:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-090RFC:RFS-RFPS-010:AmpBFilaCur-R
Spk-090RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-090RFC:RFS-RFPS-010:AmpADrvFwdOut-R
Spk-090RFC:RFS-RFPS-010:AmpBDrvFwdOut-R
files/Spk-090RFC_SC-IOC-020.archive → files/Spk-090RFC_SC-IOC-215.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-090RFC:RFS-RFPS-020:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-090RFC:RFS-RFPS-020:AmpAFilaVol-R
Spk-090RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-090RFC:RFS-RFPS-020:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-090RFC:RFS-RFPS-020:AmpBFilaVol-R Spk-090RFC:RFS-RFPS-020:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-090RFC:RFS-RFPS-020:AmpBFilaCur-R
Spk-090RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-090RFC:RFS-RFPS-020:AmpADrvFwdOut-R
Spk-090RFC:RFS-RFPS-020:AmpBDrvFwdOut-R
files/Spk-100RFC_SC-IOC-010.archive → files/Spk-100RFC_SC-IOC-115.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-100RFC:RFS-RFPS-010:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-100RFC:RFS-RFPS-010:AmpAFilaVol-R
Spk-100RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-100RFC:RFS-RFPS-010:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-100RFC:RFS-RFPS-010:AmpBFilaVol-R Spk-100RFC:RFS-RFPS-010:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-100RFC:RFS-RFPS-010:AmpBFilaCur-R
Spk-100RFC:RFS-RFPS-010:AmpAFilaCur-R Spk-100RFC:RFS-RFPS-010:AmpADrvFwdOut-R
Spk-100RFC:RFS-RFPS-010:AmpBDrvFwdOut-R
files/Spk-100RFC_SC-IOC-020.archive → files/Spk-100RFC_SC-IOC-215.archive
+ 3
− 2
View file @ 779dcd42
...@@ -326,5 +326,6 @@ Spk-100RFC:RFS-RFPS-020:AmpAFilaVol-R ...@@ -326,5 +326,6 @@ Spk-100RFC:RFS-RFPS-020:AmpAFilaVol-R
Spk-100RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-100RFC:RFS-RFPS-020:AmpAFilaCur-R
# Variable: Filament Voltage Amp-B # Variable: Filament Voltage Amp-B
Spk-100RFC:RFS-RFPS-020:AmpBFilaVol-R Spk-100RFC:RFS-RFPS-020:AmpBFilaVol-R
# Variable: Filament Current Amp-B Spk-100RFC:RFS-RFPS-020:AmpBFilaCur-R
Spk-100RFC:RFS-RFPS-020:AmpAFilaCur-R Spk-100RFC:RFS-RFPS-020:AmpADrvFwdOut-R
Spk-100RFC:RFS-RFPS-020:AmpBDrvFwdOut-R
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment