Merge branch 'master' into 'master' (c0321716) · Commits · Krisztián Löki / ess-opis

Commit c0321716 authored 4 years ago by Benjamin Bertrand

Merge branch 'master' into 'master'

Added RFQ VGC trends and TPG updates

See merge request ics-software/ess-opis!181

parents 6ae785f7 ff754141

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/gauge_status.js 10 additions, 2 deletions

...ED/COMMON/DEVICES/vacuum/COMMON/Faceplate/gauge_status.js
NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob 15 additions, 0 deletions

...S/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob
NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-status.bob 11 additions, 0 deletions

...ES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-status.bob
NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/gauge_isvalid.py 13 additions, 0 deletions

NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/gauge_isvalid.py
NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/isvalid.py 3 additions, 2 deletions

NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/isvalid.py
NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/open_gauge_brief_screen.py 5 additions, 5 deletions

...D/COMMON/DEVICES/vacuum/COMMON/open_gauge_brief_screen.py
NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/open_tpg_screen.py 49 additions, 0 deletions

...ED/COMMON/DEVICES/vacuum/veg/Faceplate/open_tpg_screen.py
NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob 1 addition, 1 deletion

...S/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob
NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob 0 additions, 3 deletions

.../vacuum/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob
NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob 1 addition, 1 deletion

...ICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob
NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg300_controller.bob 0 additions, 1 deletion

...VICES/vacuum/veg/Faceplate/vac_ctrl_tpg300_controller.bob
NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_controller.bob 364 additions, 0 deletions

...VICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_controller.bob
NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_module.bob 363 additions, 0 deletions

...N/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_module.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc-brief.bob 30 additions, 26 deletions

...COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc-brief.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc.bob 0 additions, 1 deletion

...ROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob 33 additions, 25 deletions

...COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob 15 additions, 10 deletions

...ROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vgc/vac_vgc.bob 2 additions, 1 deletion

NON-APPROVED/COMMON/DEVICES/vacuum/vgc/vac_vgc.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd-brief.bob 24 additions, 20 deletions

...COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd-brief.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd.bob 0 additions, 1 deletion

...ROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd.bob

with 939 additions and 99 deletions

Please register or to comment