Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
ess-opis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
ics-software
ess-opis
Merge requests
!238
PSS1 fixes
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
PSS1 fixes
krisztianloki/ess-opis:pss1-pss
into
master
Overview
0
Commits
14
Pipelines
0
Changes
15
Merged
Krisztián Löki
requested to merge
krisztianloki/ess-opis:pss1-pss
into
master
4 years ago
Overview
0
Commits
14
Pipelines
0
Changes
15
Expand
Dear
@benjaminbertrand
, could you please merge this? Thanks!
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
e0b08609
14 commits,
4 years ago
15 files
+
544
−
183
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
15
Search (e.g. *.vue) (Ctrl+P)
NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_module_status.bob
+
5
−
2
Options
<?xml version="1.0" encoding="UTF-8"?>
<display
version=
"2.0.0"
>
<macros>
<SYMBOLS>
../../symbols
</SYMBOLS>
</macros>
<name>
Diag
</name>
<width>
30
</width>
<height>
70
</height>
@@ -7,7 +10,7 @@
<name>
Disconnected
</name>
<pv_name>
$(DIAG_CONN_STAT)
</pv_name>
<symbols>
<symbol>
$(
ESS_
SYMBOLS
=/ess-symbols)/badges
/alarms/unconnected.svg
</symbol>
<symbol>
$(SYMBOLS
)
/alarms/unconnected.svg
</symbol>
</symbols>
<x>
3
</x>
<y>
3
</y>
@@ -24,7 +27,7 @@
<name>
Error
</name>
<pv_name>
$(DIAG_STAT)
</pv_name>
<symbols>
<symbol>
$(
ESS_
SYMBOLS
=/ess-symbols)/badges
/alarms/error.svg
</symbol>
<symbol>
$(SYMBOLS
)
/alarms/error.svg
</symbol>
</symbols>
<x>
3
</x>
<y>
43
</y>
Loading