Skip to content

Board temperature added #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huw-dls wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Board temperature added #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions merlinApp/Db/merlin.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,31 @@ record(ai, "$(P)$(R)OperatingEnergy_RBV")
field(SCAN, "I/O Intr")
}

# Board Temperature
# % autosave 2
## gdatag, pv, rw, $(PORT)_merlin, BoardTemperature, Set BoardTemperature
# record(ao, "$(P)$(R)BoardTemperature")
# {
# field(PINI, "YES")
# field(DTYP, "asynFloat64")
# field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))BOARDTEMPERATURE")
# field(DESC, "Board Temperature")
# field(EGU, "C")
# field(PREC, "3")
# field(VAL, "20.000")
# }

## gdatag, pv, ro, $(PORT)_merlin, BoardTemperature_RBV, Readback for BoardTemperature
record(ai, "$(P)$(R)BoardTemperature_RBV")
{
field(DTYP, "asynFloat64")
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))TEMPERATURE")
field(DESC, "Board Temperature")
field(EGU, "C")
field(PREC, "3")
field(SCAN, "I/O Intr")
}


# Threshold Scan Start Energy
# % autosave 2
Expand Down
275 changes: 5 additions & 270 deletions merlinApp/op/edl/merlinDetector.edl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ major 4
minor 0
release 1
x 1069
y 100
y 509
w 395
h 820
h 840
font "arial-bold-r-12.0"
ctlFont "arial-bold-r-12.0"
btnFont "arial-bold-r-12.0"
Expand All @@ -24,31 +24,16 @@ snapToGrid
gridSize 5
endScreenProperties

# (Rectangle)
object activeRectangleClass
beginObjectProperties
major 4
minor 0
release 0
x 5
y 485
w 380
h 330
lineColor index 14
fill
fillColor index 3
endObjectProperties

# (Embedded Window)
object activePipClass
beginObjectProperties
major 4
minor 1
release 0
x 5
y 490
w 380
h 160
y 475
w 385
h 360
fgColor index 14
bgColor index 3
topShadowColor index 1
Expand Down Expand Up @@ -83,253 +68,3 @@ displayFileName {
noScroll
endObjectProperties

# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
x 5
y 475
w 91
h 13
font "arial-medium-r-12.0"
fgColor index 14
bgColor index 5
value {
" Medipix driver "
}
autoSize
border
endObjectProperties

# (Textupdate)
object TextupdateClass
beginObjectProperties
major 10
minor 0
release 0
x 105
y 750
w 275
h 20
controlPv "$(P)$(R)StringToServer_RBV"
fgColor index 16
fgAlarm
bgColor index 10
fill
font "arial-bold-r-10.0"
fontAlign "center"
endObjectProperties

# (Textupdate)
object TextupdateClass
beginObjectProperties
major 10
minor 0
release 0
x 105
y 790
w 275
h 20
controlPv "$(P)$(R)StringFromServer_RBV"
fgColor index 16
fgAlarm
bgColor index 10
fill
font "arial-bold-r-10.0"
fontAlign "center"
endObjectProperties

# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
x 10
y 750
w 90
h 20
font "arial-bold-r-12.0"
fgColor index 14
bgColor index 3
useDisplayBg
value {
"To labview:"
}
endObjectProperties

# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
x 10
y 790
w 95
h 20
font "arial-bold-r-12.0"
fgColor index 14
bgColor index 3
useDisplayBg
value {
"From labview:"
}
endObjectProperties

# (Menu Button)
object activeMenuButtonClass
beginObjectProperties
major 4
minor 0
release 0
x 255
y 715
w 110
h 20
fgColor index 25
bgColor index 3
inconsistentColor index 0
topShadowColor index 1
botShadowColor index 11
controlPv "$(P)$(R)ArrayCallbacks"
indicatorPv "$(P)$(R)ArrayCallbacks_RBV"
font "arial-bold-r-12.0"
endObjectProperties

# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
x 140
y 715
w 105
h 20
font "arial-bold-r-12.0"
fontAlign "right"
fgColor index 14
bgColor index 3
useDisplayBg
value {
"Callbacks:"
}
endObjectProperties

# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
x 185
y 690
w 147
h 13
font "arial-bold-r-12.0"
fontAlign "center"
fgColor index 19
bgColor index 3
useDisplayBg
visMin "1"
visMax "2"
value {
"Data Channel Connected"
}
autoSize
endObjectProperties

# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
x 180
y 685
w 185
h 20
font "arial-bold-r-12.0"
fontAlign "center"
fgColor index 21
bgColor index 35
visPv "$(P)$(R)LabviewAsynData.CNCT"
visMin "0"
visMax "1"
value {
"Data Channel Err - reboot IOC!"
}
endObjectProperties

# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
x 185
y 665
w 184
h 13
font "arial-bold-r-12.0"
fontAlign "center"
fgColor index 19
bgColor index 3
useDisplayBg
visMin "1"
visMax "2"
value {
"Command Channel Connected"
}
autoSize
endObjectProperties

# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
x 180
y 660
w 185
h 20
font "arial-bold-r-12.0"
fontAlign "center"
fgColor index 21
bgColor index 35
visPv "$(P)$(R)LabviewAsynCmd.CNCT"
visMin "0"
visMax "1"
value {
"Cmd Channel Err - reboot IOC!"
}
endObjectProperties

# (Message Button)
object activeMessageButtonClass
beginObjectProperties
major 4
minor 1
release 0
x 15
y 710
w 105
h 25
fgColor index 20
onColor index 4
offColor index 3
topShadowColor index 1
botShadowColor index 11
controlPv "$(P)$(R)Reset"
pressValue "1"
onLabel "Reset"
offLabel "Reset"
3d
useEnumNumeric
font "arial-bold-r-12.0"
endObjectProperties

Loading