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

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

6ae785f7

Commit 6ae785f7 authored 4 years ago by Benjamin Bertrand

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Small fix on PID ADV embedded faceplate

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

parents 0891af94 4e51ee64

No related branches found

No related tags found

No related merge requests found

Changes 5

Expand all Hide whitespace changes

Inline Side-by-side

Showing

NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob 119 additions, 118 deletions

...IDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Control_Faceplate_embedded.bob 2 additions, 2 deletions

...eviceTypes/PIDControls/PID_Control_Faceplate_embedded.bob
NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob 1 addition, 1 deletion

..._LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob
NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob 1 addition, 1 deletion

...Y/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob
NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob 4 additions, 2 deletions

NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob

with 127 additions and 124 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