Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

ess-opis
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

e0e60750

Commit e0e60750 authored 5 years ago by Benjamin Bertrand

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Operator Overview OPIs and TS2 water system OPI

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

parents c8d885a0 daf62a95

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_CAV.bob 344 additions, 12 deletions

...AC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_CAV.bob
NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_FC.bob 327 additions, 11 deletions

...NAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_FC.bob
NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_LABBCM.bob 1 addition, 1 deletion

...SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_LABBCM.bob
NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/linac_synoptics_main.bob 2 additions, 2 deletions

...ON/LINAC-SYNOPTIC/synopticsfiles/linac_synoptics_main.bob
NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Navigator.bob 24 additions, 37 deletions

NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Navigator.bob
NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/NSI/0_Overview.bob 0 additions, 0 deletions

...OPERATOR-OVERVIEW-OPIS/OverviewScreens/NSI/0_Overview.bob
NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/DigitalMeasure/FS_BlockIcon_Vertical_Left.bob 17 additions, 17 deletions

...DeviceTypes/DigitalMeasure/FS_BlockIcon_Vertical_Left.bob
NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob 353 additions, 205 deletions

NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob

with 1068 additions and 285 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment