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

Commit 7a106a10 authored 5 years ago by Benjamin Bertrand

Merge branch 'master' into 'master'

Trends and phoebus/eclipse compatible screens

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

parents e62727f9 3a1d1f1f

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/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob 249 additions, 0 deletions

...AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob
NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_Faceplate.bob 1386 additions, 0 deletions

...AnalogMeasure_phoebustest/AnalogTransmitter_Faceplate.bob
NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_Faceplate_CABTR_Temperature.bob 1507 additions, 0 deletions

...bustest/AnalogTransmitter_Faceplate_CABTR_Temperature.bob
NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_Faceplate_CernoxTemperature.bob 1697 additions, 0 deletions

...bustest/AnalogTransmitter_Faceplate_CernoxTemperature.bob
NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure_phoebustest/AnalogTransmitter_Faceplate_Pt100_Temperature.bob 1697 additions, 0 deletions

...bustest/AnalogTransmitter_Faceplate_Pt100_Temperature.bob
NON-APPROVED/TS2/ts2-cryomodule/4K_limits_basic.sh 398 additions, 0 deletions

NON-APPROVED/TS2/ts2-cryomodule/4K_limits_basic.sh
NON-APPROVED/TS2/ts2-cryomodule/ChangeLimits.bob 891 additions, 0 deletions

NON-APPROVED/TS2/ts2-cryomodule/ChangeLimits.bob
NON-APPROVED/TS2/ts2-cryomodule/TS2_main.bob 10 additions, 10 deletions

NON-APPROVED/TS2/ts2-cryomodule/TS2_main.bob
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_Biphasic_Line.bob 47 additions, 0 deletions

NON-APPROVED/TS2/ts2-cryomodule/trends/CM_Biphasic_Line.bob
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_Biphasic_Line.plt 216 additions, 0 deletions

NON-APPROVED/TS2/ts2-cryomodule/trends/CM_Biphasic_Line.plt
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_Biphasic_Line_eclipse.plt 328 additions, 0 deletions

...ED/TS2/ts2-cryomodule/trends/CM_Biphasic_Line_eclipse.plt
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_CTS.bob 47 additions, 0 deletions

NON-APPROVED/TS2/ts2-cryomodule/trends/CM_CTS.bob
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_CTS.plt 144 additions, 0 deletions

NON-APPROVED/TS2/ts2-cryomodule/trends/CM_CTS.plt
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_CTS_eclipse.plt 197 additions, 0 deletions

NON-APPROVED/TS2/ts2-cryomodule/trends/CM_CTS_eclipse.plt
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_Cavity_Fill.bob 47 additions, 0 deletions

NON-APPROVED/TS2/ts2-cryomodule/trends/CM_Cavity_Fill.bob
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_Cavity_Fill.plt 216 additions, 0 deletions

NON-APPROVED/TS2/ts2-cryomodule/trends/CM_Cavity_Fill.plt
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_Cavity_Fill_eclipse.plt 260 additions, 0 deletions

...OVED/TS2/ts2-cryomodule/trends/CM_Cavity_Fill_eclipse.plt
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_FPC_Cold.bob 47 additions, 0 deletions

NON-APPROVED/TS2/ts2-cryomodule/trends/CM_FPC_Cold.bob
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_FPC_Cold.plt 144 additions, 0 deletions

NON-APPROVED/TS2/ts2-cryomodule/trends/CM_FPC_Cold.plt
NON-APPROVED/TS2/ts2-cryomodule/trends/CM_FPC_Cold_eclipse.plt 168 additions, 0 deletions

...PPROVED/TS2/ts2-cryomodule/trends/CM_FPC_Cold_eclipse.plt

with 9696 additions and 10 deletions

Please register or to comment