From d14a9e757a4fc497a60bf8fb5a0d58bcb86af385 Mon Sep 17 00:00:00 2001 From: rivers Date: Thu, 25 Mar 2010 01:35:11 +0000 Subject: [PATCH] Added additional macro parameters for configuration from substitutions file; add I/O Intr scanning on input PVs which had been overlooked git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@10346 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/Db/NDOverlay.template | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ADApp/Db/NDOverlay.template b/ADApp/Db/NDOverlay.template index c2dbe65..6b8ea4e 100644 --- a/ADApp/Db/NDOverlay.template +++ b/ADApp/Db/NDOverlay.template @@ -10,6 +10,7 @@ record(stringout, "$(P)$(R)Name") field(PINI, "YES") field(DTYP, "asynOctetWrite") field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))NAME") + field(VAL, "$(NAME)") } record(stringin, "$(P)$(R)Name_RBV") @@ -39,6 +40,8 @@ record(bi, "$(P)$(R)Use_RBV") field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))USE") field(ZNAM, "No") field(ONAM, "Yes") + field(ZSV, "NO_ALARM") + field(OSV, "MINOR") field(SCAN, "I/O Intr") } @@ -48,7 +51,7 @@ record(bi, "$(P)$(R)Use_RBV") record(longout, "$(P)$(R)PositionXLink") { - field(DOL, "CP") + field(DOL, "$(XPOS) CP MS") field(OMSL, "closed_loop") field(OUT, "$(P)$(R)PositionX PP") } @@ -72,10 +75,11 @@ record(longin, "$(P)$(R)PositionX_RBV") record(longout, "$(P)$(R)PositionYLink") { - field(DOL, "CP") + field(DOL, "$(YPOS) CP MS") field(OMSL, "closed_loop") field(OUT, "$(P)$(R)PositionY PP") } + record(longout, "$(P)$(R)PositionY") { field(PINI, "YES") @@ -95,7 +99,7 @@ record(longin, "$(P)$(R)PositionY_RBV") record(longout, "$(P)$(R)SizeXLink") { - field(DOL, "CP") + field(DOL, "$(XSIZE) CP MS") field(OMSL, "closed_loop") field(OUT, "$(P)$(R)SizeX PP") } @@ -119,7 +123,7 @@ record(longin, "$(P)$(R)SizeX_RBV") record(longout, "$(P)$(R)SizeYLink") { - field(DOL, "CP") + field(DOL, "$(YSIZE) CP MS") field(OMSL, "closed_loop") field(OUT, "$(P)$(R)SizeY PP") } @@ -150,6 +154,7 @@ record(mbbo, "$(P)$(R)Shape") field(ZRVL, "0") field(ONST, "Rectangle") field(ONVL, "1") + field(VAL, "$(SHAPE)") } record(mbbi, "$(P)$(R)Shape_RBV") @@ -160,6 +165,7 @@ record(mbbi, "$(P)$(R)Shape_RBV") field(ZRVL, "0") field(ONST, "Rectangle") field(ONVL, "1") + field(SCAN, "I/O Intr") } record(mbbo, "$(P)$(R)DrawMode") @@ -181,6 +187,7 @@ record(mbbi, "$(P)$(R)DrawMode_RBV") field(ZRVL, "0") field(ONST, "XOR") field(ONVL, "1") + field(SCAN, "I/O Intr") } record(longout, "$(P)$(R)Red")