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

Commit 2cd29812 authored 4 years ago by Benjamin Bertrand

Merge branch 'master' into 'master'

Major updates to the TICP OPIs

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

parents de496e01 422c2e6a

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

NON-APPROVED/Cryo/Cryo OPIs.bob 50 additions, 1 deletion

NON-APPROVED/Cryo/Cryo OPIs.bob
NON-APPROVED/Cryo/ICS_OPI_LIBRARY/symbols/graphics/ESS Logos/ESS_logotype_cyan_S.png 0 additions, 0 deletions

...IBRARY/symbols/graphics/ESS Logos/ESS_logotype_cyan_S.png
NON-APPROVED/Cryo/ICS_OPI_LIBRARY/symbols/graphics/ESS Logos/ESS_symbol_cyan_S.png 0 additions, 0 deletions

..._LIBRARY/symbols/graphics/ESS Logos/ESS_symbol_cyan_S.png
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Common/Embedded/TICP-Header.bob 762 additions, 1129 deletions

...yo/TICP/CrS-TICP_CRYO_ESS/Common/Embedded/TICP-Header.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Common/Embedded/TICP-LCRDisplayTemplate.bob 15 additions, 0 deletions

...TICP_CRYO_ESS/Common/Embedded/TICP-LCRDisplayTemplate.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Common/Embedded/TICP-menualarm.bob 385 additions, 0 deletions

...TICP/CrS-TICP_CRYO_ESS/Common/Embedded/TICP-menualarm.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/atten.bob 15 additions, 35 deletions

...Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/atten.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/bc.bob 98 additions, 163 deletions

...ED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/bc.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/bc_pv.bob 21 additions, 8 deletions

...Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/bc_pv.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/bc_sr.bob 70 additions, 166 deletions

...Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/bc_sr.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/comp.bob 18 additions, 15 deletions

.../Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/comp.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/comp_k.bob 14 additions, 12 deletions

...ryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/comp_k.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/cv.bob 28 additions, 70 deletions

...ED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/cv.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/do.bob 31 additions, 40 deletions

...ED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/do.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/heater.bob 50 additions, 146 deletions

...ryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/heater.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/meas.bob 44 additions, 41 deletions

.../Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/meas.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/meas_ft.bob 45 additions, 41 deletions

...yo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/meas_ft.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/param.bob 2 additions, 0 deletions

...Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/param.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/paramButton.bob 167 additions, 0 deletions

...ICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/paramButton.bob
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/pump1-2.bob 51 additions, 48 deletions

...yo/TICP/CrS-TICP_CRYO_ESS/Controls/Faceplates/pump1-2.bob

with 1866 additions and 1915 deletions

Please register or to comment