Merge branch 'master' of https://gitlab.esss.lu.se/ics-software/ess-opis (e5c74333) · Commits · Krisztián Löki / ess-opis

Commit e5c74333 authored 4 years ago by Per Nilsson2

Browse files

Merge branch 'master' of https://gitlab.esss.lu.se/ics-software/ess-opis

parents 8730b6aa 777a061d

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/interlock_leds.bob 0 additions, 12 deletions

...COMMON/DEVICES/vacuum/COMMON/Faceplate/interlock_leds.bob
NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_vpi-interlocks.bob 196 additions, 0 deletions

...ON/DEVICES/vacuum/COMMON/Faceplate/vac_vpi-interlocks.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob 169 additions, 87 deletions

NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vpi/vac_vpi.bob 4 additions, 4 deletions

NON-APPROVED/COMMON/DEVICES/vacuum/vpi/vac_vpi.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/Faceplate/vac-vpdp-popup.bob 0 additions, 21 deletions

...MMON/DEVICES/vacuum/vpp-vpdp/Faceplate/vac-vpdp-popup.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/error.py 11 additions, 11 deletions

NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/error.py
NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob 3 additions, 2 deletions

NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/warning.py 5 additions, 5 deletions

NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/warning.py
NON-APPROVED/COMMON/DEVICES/vacuum/vpt/Faceplate/vac-vpt-popup.bob 0 additions, 22 deletions

...VED/COMMON/DEVICES/vacuum/vpt/Faceplate/vac-vpt-popup.bob
NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob 3 additions, 2 deletions

NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob
NON-APPROVED/Cryo/CMS_OPI/CMS_OPI_MASTER/Diagnostics/Connection_v02.bob 0 additions, 0 deletions

...ryo/CMS_OPI/CMS_OPI_MASTER/Diagnostics/Connection_v02.bob
NON-APPROVED/Cryo/CMS_OPI/CMS_OPI_MASTER/Diagnostics/DiagState.bob 0 additions, 0 deletions

...VED/Cryo/CMS_OPI/CMS_OPI_MASTER/Diagnostics/DiagState.bob
NON-APPROVED/Cryo/CMS_OPI/CMS_OPI_MASTER/Diagnostics/maintenance.bob 0 additions, 0 deletions

...D/Cryo/CMS_OPI/CMS_OPI_MASTER/Diagnostics/maintenance.bob
NON-APPROVED/Cryo/CMS_OPI/CMS_OPI_MASTER/OPIBackGrounds/ColdBoxBackGround.png 0 additions, 0 deletions

...S_OPI/CMS_OPI_MASTER/OPIBackGrounds/ColdBoxBackGround.png
NON-APPROVED/Cryo/CMS_OPI/CMS_OPI_MASTER/OPIBackGrounds/DistributionBoxBackGround.png 0 additions, 0 deletions

...S_OPI_MASTER/OPIBackGrounds/DistributionBoxBackGround.png
NON-APPROVED/Cryo/CMS_OPI/CMS_OPI_MASTER/OPIBackGrounds/GasManagementPanelBackGround.png 0 additions, 0 deletions

...PI_MASTER/OPIBackGrounds/GasManagementPanelBackGround.png
NON-APPROVED/Cryo/CMS_OPI/CMS_OPI_MASTER/OPIBackGrounds/PumpCoolingBackGround.png 0 additions, 0 deletions

...I/CMS_OPI_MASTER/OPIBackGrounds/PumpCoolingBackGround.png
NON-APPROVED/Cryo/CMS_OPI/CMS_OPI_MASTER/Symbols/CP_Pump_GREEN.png 0 additions, 0 deletions

...VED/Cryo/CMS_OPI/CMS_OPI_MASTER/Symbols/CP_Pump_GREEN.png
NON-APPROVED/Cryo/CMS_OPI/CMS_OPI_MASTER/Symbols/CP_Pump_RED.png 0 additions, 0 deletions

...ROVED/Cryo/CMS_OPI/CMS_OPI_MASTER/Symbols/CP_Pump_RED.png
NON-APPROVED/Cryo/CMS_OPI/CMS_OPI_MASTER/Symbols/CP_Pump_WHITE.png 0 additions, 0 deletions

...VED/Cryo/CMS_OPI/CMS_OPI_MASTER/Symbols/CP_Pump_WHITE.png

with 391 additions and 166 deletions

Please register or to comment

Admin message

Merge branch 'master' of https://gitlab.esss.lu.se/ics-software/ess-opis