Merge branch 'pss1-pss' into 'master' (35b42d73) · 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

35b42d73

Commit 35b42d73 authored 4 years ago by Te-Hung Tseng

Downloads
- Plain Diff

Merge branch 'pss1-pss' into 'master'

PSS1 fixes

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

parents 96dbd5d8 88bc51b4

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob 111 additions, 23 deletions

NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob 121 additions, 75 deletions

NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob 1 addition, 0 deletions

...ED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob 2 additions, 1 deletion

...D/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob 2 additions, 1 deletion

...D/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob
NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob 2 additions, 1 deletion

...PROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob
NON-APPROVED/pss1-pss/embedded_displays/esob.bob 1 addition, 1 deletion

NON-APPROVED/pss1-pss/embedded_displays/esob.bob
NON-APPROVED/pss1-pss/embedded_displays/esos.bob 3 additions, 0 deletions

NON-APPROVED/pss1-pss/embedded_displays/esos.bob
NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob 79 additions, 83 deletions

...D/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
NON-APPROVED/pss1-pss/scripts/wire.py 40 additions, 0 deletions

NON-APPROVED/pss1-pss/scripts/wire.py

with 362 additions and 185 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