Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
Engineer
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Show more breadcrumbs
opis
ACC
PBI
Engineer
Merge requests
!38
nBLM: CAEN power supply OPI update
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
nBLM: CAEN power supply OPI update
andreaspersson/pbi-opi-engineer:ICSHWI-11887
into
master
Overview
0
Commits
1
Pipelines
0
Changes
3
Merged
Andreas Persson
requested to merge
andreaspersson/pbi-opi-engineer:ICSHWI-11887
into
master
2 years ago
Overview
0
Commits
1
Pipelines
0
Changes
3
Expand
See
ICSHWI-11887
Edited
2 years ago
by
Andreas Persson
1
0
Merge request reports
Compare
master
version 2
2f141f67
2 years ago
version 1
8b972572
2 years ago
master (base)
and
latest version
latest version
d4db9933
1 commit,
2 years ago
version 2
2f141f67
1 commit,
2 years ago
version 1
8b972572
1 commit,
2 years ago
3 files
+
56
−
14
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
Search (e.g. *.vue) (Ctrl+P)
10-Top/nblm/power.bob
+
56
−
5
Options
@@ -39,10 +39,13 @@
</children>
</tab>
<tab>
<name>
Low Voltage
</name>
<name>
Low Voltage
1
</name>
<children>
<widget
type=
"embedded"
version=
"2.0.0"
>
<name>
Linking Container
</name>
<macros>
<Idx>
101
</Idx>
</macros>
<file>
../../99-Shared/caensyproxy/LV/LV_A2519_global.bob
</file>
<x>
5
</x>
<y>
5
</y>
@@ -59,13 +62,62 @@
</children>
</tab>
<tab>
<name>
High
Voltage
</name>
<name>
Low
Voltage
2
</name>
<children>
<widget
type=
"embedded"
version=
"2.0.0"
>
<name>
Linking Container_1
</name>
<macros>
<Idx>
102
</Idx>
</macros>
<file>
../../99-Shared/caensyproxy/LV/LV_A2519_global.bob
</file>
<x>
5
</x>
<y>
5
</y>
<width>
1800
</width>
<height>
1600
</height>
<resize>
2
</resize>
<actions>
</actions>
<border_color>
<color
red=
"0"
green=
"128"
blue=
"255"
>
</color>
</border_color>
</widget>
</children>
</tab>
<tab>
<name>
High Voltage 1
</name>
<children>
<widget
type=
"embedded"
version=
"2.0.0"
>
<name>
Linking Container_2
</name>
<macros>
<Idx>
101
</Idx>
</macros>
<file>
../../99-Shared/caensyproxy/HV/HV_A7030_global.bob
</file>
<x>
5
</x>
<y>
5
</y>
<width>
2000
</width>
<height>
2000
</height>
<resize>
2
</resize>
<actions>
</actions>
<border_color>
<color
red=
"0"
green=
"128"
blue=
"255"
>
</color>
</border_color>
</widget>
</children>
</tab>
<tab>
<name>
High Voltage 2
</name>
<children>
<widget
type=
"embedded"
version=
"2.0.0"
>
<name>
Linking Container_3
</name>
<macros>
<Idx>
102
</Idx>
</macros>
<file>
../../99-Shared/caensyproxy/HV/HV_A7030_global.bob
</file>
<x>
5
</x>
<y>
6
</y>
<y>
5
</y>
<width>
2000
</width>
<height>
2000
</height>
<resize>
2
</resize>
@@ -91,7 +143,6 @@
<color
name=
"BACKGROUND"
red=
"220"
green=
"225"
blue=
"221"
>
</color>
</background_color>
<active_tab>
2
</active_tab>
<tab_height>
10
</tab_height>
<actions>
</actions>
@@ -112,7 +163,7 @@
<widget
type=
"label"
version=
"2.0.0"
>
<name>
Label
</name>
<class>
TITLE
</class>
<text>
nBLM
p
ower
</text>
<text>
nBLM
P
ower
Supply
</text>
<x
use_class=
"true"
>
20
</x>
<y
use_class=
"true"
>
0
</y>
<width>
600
</width>
Loading