Skip to content
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.

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

feature addition #2

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 44 additions & 0 deletions roperApp/Db/roper.template
Original file line number Diff line number Diff line change
Expand Up @@ -243,4 +243,48 @@ record(waveform, "$(P)$(R)Comment5_RBV")
field(SCAN, "I/O Intr")
}

# Temperature status
record(bi, "$(P)$(R)TempStatus_RBV")
{
field(DTYP, "asynInt32")
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))ROPER_TEMP_STATUS")
field(ZNAM, "Not Locked")
field(ONAM, "Locked")
field(SCAN, "I/O Intr")
}

# Background image file name
record(waveform,"$(P)$(R)BgdFileName")
{
field(DTYP, "asynOctetWrite")
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))ROPER_DARKNAME")
field(FTVL, "CHAR")
field(NELM, "128")
}

record(waveform,"$(P)$(R)BgdFileName_RBV")
{
field(DTYP, "asynOctetRead")
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))ROPER_DARKNAME")
field(FTVL, "CHAR")
field(NELM, "128")
field(SCAN, "I/O Intr")
}

record(bo, "$(P)$(R)UseBgd")
{
field(PINI, "YES")
field(DTYP, "asynInt32")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))ROPER_BBACKSUBTRACT")
field(ZNAM, "No")
field(ONAM, "Yes")
}

record(bi, "$(P)$(R)UseBgd_RBV")
{
field(DTYP, "asynInt32")
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))ROPER_BBACKSUBTRACT")
field(ZNAM, "No")
field(ONAM, "Yes")
field(SCAN, "I/O Intr")
}
2 changes: 2 additions & 0 deletions roperApp/Db/roper_settings.req
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ $(P)$(R)NumAcquisitions
$(P)$(R)RoperShutterMode
$(P)$(R)AutoDataType
$(P)$(R)Temperature
$(P)$(R)UseBgd
$(P)$(R)BgdFileName
$(P)$(R)Comment1
$(P)$(R)Comment2
$(P)$(R)Comment3
Expand Down
95 changes: 91 additions & 4 deletions roperApp/op/adl/Roper.adl
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

file {
name="/home/epics/devel/areaDetector/ADApp/op/adl/Roper.adl"
version=030102
name="/work/sls/config/medm/Roper.adl"
version=030105
}
display {
object {
x=175
y=80
width=700
height=820
height=850
}
clr=14
bclr=4
Expand Down Expand Up @@ -1212,7 +1212,7 @@ rectangle {
x=5
y=340
width=335
height=410
height=500
}
"basic attribute" {
clr=14
Expand Down Expand Up @@ -2022,3 +2022,90 @@ composite {
"composite name"=""
"composite file"="ADAttrFile.adl"
}
"text update" {
object {
x=114
y=787
width=200
height=18
}
monitor {
chan="$(P)$(R)BgdFileName_RBV"
clr=54
bclr=4
}
format="string"
limits {
}
}
"text entry" {
object {
x=16
y=811
width=300
height=20
}
control {
chan="$(P)$(R)BgdFileName"
clr=14
bclr=51
}
format="string"
limits {
}
}
menu {
object {
x=140
y=757
width=80
height=20
}
control {
chan="$(P)$(R)UseBgd"
clr=14
bclr=51
}
}
"text update" {
object {
x=235
y=759
width=79
height=18
}
monitor {
chan="$(P)$(R)UseBgd_RBV"
clr=54
bclr=4
}
format="string"
limits {
}
}
text {
object {
x=21
y=757
width=110
height=20
}
"basic attribute" {
clr=14
}
textix="Background"
align="horiz. right"
}
text {
object {
x=31
y=785
width=60
height=20
}
"basic attribute" {
clr=14
}
textix="File"
align="horiz. right"
}
2 changes: 1 addition & 1 deletion roperApp/src/CDocFile40.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Machine generated IDispatch wrapper class(es) created with Add Class from Typelib Wizard

#import "C:\\Program Files\\PI Acton\\WinView\\Winview.exe" no_namespace
#import "WINX32Lib.tlb" no_namespace
// CDocFile40 wrapper class

class CDocFile40 : public COleDispatchDriver
Expand Down
2 changes: 1 addition & 1 deletion roperApp/src/CExpSetup20.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Machine generated IDispatch wrapper class(es) created with Add Class from Typelib Wizard

#import "C:\\Program Files\\PI Acton\\WinView\\Winview.exe" no_namespace
#import "WINX32Lib.tlb" no_namespace
// CExpSetup20 wrapper class

class CExpSetup20 : public COleDispatchDriver
Expand Down
2 changes: 1 addition & 1 deletion roperApp/src/CROIRect0.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Machine generated IDispatch wrapper class(es) created with Add Class from Typelib Wizard

#import "C:\\Program Files\\PI Acton\\WinView\\Winview.exe" no_namespace
#import "WINX32Lib.tlb" no_namespace
// CROIRect0 wrapper class

class CROIRect0 : public COleDispatchDriver
Expand Down
2 changes: 1 addition & 1 deletion roperApp/src/CWinx32App20.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#undef max
#endif

#import "C:\\Program Files\\PI Acton\\WinView\\Winview.exe" no_namespace
#import "WINX32Lib.tlb" no_namespace
// CWinx32App20 wrapper class

class CWinx32App20 : public COleDispatchDriver
Expand Down
Binary file added roperApp/src/WINX32Lib.tlb
Binary file not shown.
Loading