Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
advLigoRTS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
CDS
software
advLigoRTS
Commits
6adffaa4
Commit
6adffaa4
authored
4 years ago
by
Rolf Bork
Browse files
Options
Downloads
Patches
Plain Diff
A few updates to GDSTP and FE_STAT screens.
parent
ab893865
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/epics/util/lib/medmGenGdsTp.pm
+39
-21
39 additions, 21 deletions
src/epics/util/lib/medmGenGdsTp.pm
src/epics/util/lib/medmGenStatus.pm
+2
-0
2 additions, 0 deletions
src/epics/util/lib/medmGenStatus.pm
with
41 additions
and
21 deletions
src/epics/util/lib/medmGenGdsTp.pm
+
39
−
21
View file @
6adffaa4
...
...
@@ -203,36 +203,54 @@ sub createGdsMedm
$medmdata
.=
("
CDS::medmGen::medmGenTextDyn
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
ExtClk
",
$ecolors
{
green
},"
(A&255) == 0
","
$ifo
\
:FEC-
$dcuid
\
_TIME_ERR
");
# Add cycle/user time label
$xpos
=
125
;
$ypos
=
129
;
$width
=
50
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenText
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
CYCLE
",
$ecolors
{
black
});
# Add Cycle Time Monitor
$xpos
=
132
;
$ypos
=
147
;
$width
=
35
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenTextMon
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_ADC_WAIT
",
$ecolors
{
white
},
$ecolors
{
black
},"
alarm
");
# Following only for IOP
if
(
$iopModel
==
1
and
$ioptype
==
0
)
{
$yoffset
=
0
;
}
else
{
$yoffset
=
17
;
}
# Add CPU labels
$xpos
=
76
;
$ypos
=
1
8
7
;
$width
=
35
;
$height
=
15
;
$xpos
=
76
;
$ypos
=
17
0
+
$yoffset
;
$width
=
35
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenText
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
USER
",
$ecolors
{
black
});
$xpos
=
117
;
$
y
pos
=
187
;
$width
=
35
;
$height
=
15
;
$
x
pos
+=
39
;
$medmdata
.=
("
CDS::medmGen::medmGenText
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
TOTAL
",
$ecolors
{
black
});
$xpos
=
157
;
$
y
pos
=
187
;
$width
=
35
;
$height
=
15
;
$
x
pos
+
=
40
;
$medmdata
.=
("
CDS::medmGen::medmGenText
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
MAX
",
$ecolors
{
black
});
# Add cpu max time label
$xpos
=
18
;
$ypos
=
203
;
$width
=
50
;
$height
=
15
;
$xpos
=
18
;
$ypos
=
186
+
$yoffset
;
$width
=
50
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenText
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
CPU
",
$ecolors
{
black
});
# Add User Time Monitor
$xpos
=
76
;
$ypos
=
203
;
$width
=
35
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenTextMon
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_USR_TIME
",
$ecolors
{
white
},
$ecolors
{
black
},"
alarm
");
$xpos
=
76
;
$ypos
=
186
+
$yoffset
;
$width
=
35
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenTextMon
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_USR_TIME
",
$ecolors
{
white
},
$ecolors
{
black
},"
alarm
");
# Add CPU Time Monitor
$xpos
=
117
;
$ypos
=
203
;
$width
=
35
;
$height
=
15
;
$xpos
=
117
;
$medmdata
.=
("
CDS::medmGen::medmGenTextMon
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_CPU_METER
",
$ecolors
{
white
},
$ecolors
{
black
},"
alarm
");
# Add CPU Time Max Monitor
$xpos
=
157
;
$ypos
=
203
;
$width
=
35
;
$height
=
15
;
$xpos
=
157
;
$medmdata
.=
("
CDS::medmGen::medmGenTextMon
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_CPU_METER_MAX
",
$ecolors
{
white
},
$ecolors
{
black
},"
alarm
");
# Add UPTIME INFO
$xpos
=
18
;
$ypos
=
221
+
$yoffset
;
$width
=
50
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenText
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
UPTIME
",
$ecolors
{
black
});
$xpos
=
76
;
$ypos
=
205
+
$yoffset
;
$width
=
35
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenText
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
DAY
",
$ecolors
{
black
});
$xpos
=
117
;
$medmdata
.=
("
CDS::medmGen::medmGenText
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
HOUR
",
$ecolors
{
black
});
$xpos
=
157
;
$medmdata
.=
("
CDS::medmGen::medmGenText
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
MIN
",
$ecolors
{
black
});
$xpos
=
76
;
$ypos
=
221
+
$yoffset
;
$width
=
35
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenTextMon
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_UPTIME_DAY
",
$ecolors
{
white
},
$ecolors
{
black
},"
static
");
$xpos
=
117
;
$medmdata
.=
("
CDS::medmGen::medmGenTextMon
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_UPTIME_HOUR
",
$ecolors
{
white
},
$ecolors
{
black
},"
static
");
$xpos
=
157
;
$medmdata
.=
("
CDS::medmGen::medmGenTextMon
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_UPTIME_MINUTE
",
$ecolors
{
white
},
$ecolors
{
black
},"
static
");
# Add More Info related display link
$xpos
=
18
;
$ypos
=
326
;
$width
=
125
;
$height
=
25
;
$mdlNamelc
=
lc
(
$mdlName
);
$relDisp
=
"
$medmTarget
\
/
$mdlNamelc
\
/
$mdlName
\
_FE_STATS.adl
";
...
...
@@ -242,22 +260,22 @@ sub createGdsMedm
if
(
$iopModel
==
1
and
$ioptype
==
0
)
{
# Add ADC Duotone Diag label
$xpos
=
18
;
$ypos
=
2
2
6
;
$width
=
50
;
$height
=
15
;
$xpos
=
18
;
$ypos
=
2
4
6
;
$width
=
50
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenText
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
DT/IRIG
",
$ecolors
{
black
});
# Add ADC Duotone Monitor
$xpos
=
75
;
$ypos
=
2
2
6
;
$width
=
35
;
$height
=
15
;
$xpos
=
75
;
$ypos
=
2
4
6
;
$width
=
35
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenTextMon
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_DUOTONE_TIME
",
$ecolors
{
white
},
$ecolors
{
black
},"
alarm
");
# Add IRIG-B Monitor
$xpos
=
115
;
$ypos
=
2
2
6
;
$width
=
35
;
$height
=
15
;
$xpos
=
115
;
$ypos
=
2
4
6
;
$width
=
35
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenTextMon
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_IRIGB_TIME
",
$ecolors
{
white
},
$ecolors
{
black
},"
alarm
");
# Add DAC Duotone Diag label
$xpos
=
18
;
$ypos
=
26
0
;
$width
=
50
;
$height
=
15
;
$xpos
=
18
;
$ypos
=
26
8
;
$width
=
50
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenText
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
DT DAC
",
$ecolors
{
black
});
# Add DAC Duotone Monitor
$xpos
=
75
;
$ypos
=
2
85
;
$width
=
35
;
$height
=
15
;
$xpos
=
75
;
$ypos
=
2
93
;
$width
=
35
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenTextMon
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_DUOTONE_TIME_DAC
",
$ecolors
{
white
},
$ecolors
{
black
},"
alarm
");
# Add DAC DT On/Off
$xpos
=
18
;
$ypos
=
2
76
;
$width
=
50
;
$height
=
35
;
$xpos
=
18
;
$ypos
=
2
84
;
$width
=
50
;
$height
=
35
;
$medmdata
.=
("
CDS::medmGen::medmGenChoice
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
$ifo
\
:FEC-
$dcuid
\
_DACDT_ENABLE
",
$ecolors
{
white
},
$ecolors
{
blue
});
}
...
...
This diff is collapsed.
Click to expand it.
src/epics/util/lib/medmGenStatus.pm
+
2
−
0
View file @
6adffaa4
...
...
@@ -117,6 +117,7 @@ sub createStatusMedm
if
(
$iopModel
==
1
)
{
# Add ADC status labels
$xpos
=
10
;
$ypos
=
330
;
$width
=
100
;
$height
=
15
;
$medmdata
.=
("
CDS::medmGen::medmGenTextLeft
")
->
(
$xpos
,
$ypos
,
$width
,
$height
,"
ADC STATUS
",
$ecolors
{
white
});
...
...
@@ -220,6 +221,7 @@ sub createStatusMedm
$xpos
+=
55
;
$ypos
=
483
;
}
}
print
OUTMEDM
"
$medmdata
\n
";
close
OUTMEDM
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment