Skip to content
Open
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
envPaths
*~
O.*
bin
Expand All @@ -7,6 +8,5 @@ data
documentation
lib
.svn*
iocs/*IOC*
iocs/example
.idea
*.local
1 change: 1 addition & 0 deletions ADPhantomApp/Db/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ include $(TOP)/configure/CONFIG
#
DB += phantomCamera.template
DB += phantomCine.template
DB += phatom_settings.req

#----------------------------------------------------
# In a Diamond IOC Application, build db files from
Expand Down
52 changes: 52 additions & 0 deletions ADPhantomApp/Db/phantomCamera.template
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,54 @@ record(calcout, "$(P)$(R)AcqNotify")
field(SCAN, "1 second")
}

record(ao, "$(P)$(R)AcquireTimeMs") {
field(DTYP, "Soft Channel")
field(DESC, "Acquisition time in milliseconds")
field(FLNK, "$(P)$(R)CalcAcquireTime PP NMS")
field(EGU, "ms")
}

record(calcout, "$(P)$(R)CalcAcquireTime") {
field(DTYP, "Soft Channel")
field(INPA, "$(P)$(R)AcquireTimeMs")
field(CALC, "A / 1000")
field(OOPT, "On Change")
field(OUT, "$(P)$(R)AcquireTime PP NMS")
}

record(calcout, "$(P)$(R)AcquireTimeMs_RBV") {
field(DTYP, "Soft Channel")
field(INPA, "$(P)$(R)AcquireTime_RBV")
field(CALC, "A * 1000")
field(EGU, "ms")
field(SCAN, "1 second")
}


record(ao, "$(P)$(R)AcquirePeriodMs") {
field(DTYP, "Soft Channel")
field(DESC, "Acquisition Period in milliseconds")
field(FLNK, "$(P)$(R)CalcAcquirePeriod PP NMS")
field(EGU, "ms")
}

record(calcout, "$(P)$(R)CalcAcquirePeriod") {
field(DTYP, "Soft Channel")
field(INPA, "$(P)$(R)AcquirePeriodMs")
field(CALC, "A / 1000")
field(OOPT, "On Change")
field(OUT, "$(P)$(R)AcquirePeriod PP NMS")
}

record(calcout, "$(P)$(R)AcquirePeriodMs_RBV") {
field(DTYP, "Soft Channel")
field(INPA, "$(P)$(R)AcquirePeriod_RBV")
field(CALC, "A * 1000")
field(EGU, "ms")
field(SCAN, "1 second")
}


################################################################
###
### Partition and Cine Count
Expand Down Expand Up @@ -647,13 +695,15 @@ record(longout, "$(P)$(R)EDR")
{
field(DESC, "Extended Dynamic Range in ns")
field(DTYP, "asynInt32")
field(EGU, "ns")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))PHANTOM_EDR")
}

record(longin, "$(P)$(R)EDR_RBV")
{
field(DESC, "Extended Dynamic Range in ns")
field(DTYP, "asynInt32")
field(EGU, "ns")
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))PHANTOM_EDR")
field(SCAN, "I/O Intr")
}
Expand All @@ -662,13 +712,15 @@ record(longout, "$(P)$(R)FrameDelay")
{
field(DESC, "Frame Delay in us")
field(DTYP, "asynInt32")
field(EGU, "us")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))PHANTOM_FRAME_DELAY")
}

record(longin, "$(P)$(R)FrameDelay_RBV")
{
field(DESC, "Frame Delay in us")
field(DTYP, "asynInt32")
field(EGU, "us")
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))PHANTOM_FRAME_DELAY")
field(SCAN, "I/O Intr")
}
Expand Down
37 changes: 37 additions & 0 deletions ADPhantomApp/Db/phantom_settings.req
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
file "ADBase_settings.req", P=$(P), R=$(R)

# ADPhantom specific settings
$(P)$(R)AcquireTimeMs
$(P)$(R)PostTrigFrames
$(P)$(R)AutoAdvance
$(P)$(R)AutoSave
$(P)$(R)AutoRestart
$(P)$(R)AutoBref
$(P)$(R)CineName
$(P)$(R)SelectedCine
$(P)$(R)DownloadStartFrame
$(P)$(R)DownloadEndFrame
$(P)$(R)DownloadStartCine
$(P)$(R)DownloadEndCine
$(P)$(R)DownloadFrameMode
$(P)$(R)DownloadSpeed
$(P)$(R)MarkCineSaved
$(P)$(R)ExtSyncType
$(P)$(R)EDR
$(P)$(R)FrameDelay
$(P)$(R)TriggerEdge
$(P)$(R)TriggerFilter
$(P)$(R)ReadySignal
$(P)$(R)Aux1PinMode
$(P)$(R)Aux2PinMode
$(P)$(R)Aux4PinMode
$(P)$(R)QuietFan
$(P)$(R)AutoTriggerX
$(P)$(R)AutoTriggerY
$(P)$(R)AutoTriggerW
$(P)$(R)AutoTriggerH
$(P)$(R)AutoTriggerThresh
$(P)$(R)AutoTriggerArea
$(P)$(R)AutoTriggerInterval
$(P)$(R)AutoTriggerMode
$(P)$(R)SelectPixelDataFormat
2 changes: 1 addition & 1 deletion ADPhantomApp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *opi*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *op*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard protocol))
include $(TOP)/configure/RULES_DIRS

8 changes: 8 additions & 0 deletions ADPhantomApp/op/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
TOP = ../..
include $(TOP)/configure/CONFIG

DIRS += symbol
DIRS += edl
DIRS += bob

include $(TOP)/configure/RULES_DIRS
File renamed without changes.
Loading