From de260384a446df562f1bc3a226e22264c97a1828 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Sat, 1 Nov 2008 23:09:36 +0000
Subject: [PATCH] Changed ImageType to FrameType/FrameType_RBV, changed
 TimeRemaining to TimeRemaining_RBV

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7745 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/Db/ADBase.template | 57 +++++++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/ADApp/Db/ADBase.template b/ADApp/Db/ADBase.template
index d8eb2b6..36b1e02 100644
--- a/ADApp/Db/ADBase.template
+++ b/ADApp/Db/ADBase.template
@@ -297,6 +297,14 @@ record(ai, "$(P)$(R)AcquirePeriod_RBV")
    field(SCAN, "I/O Intr")
 }
 
+record(ai, "$(P)$(R)TimeRemaining_RBV")
+{
+   field(PINI, "1")
+   field(DTYP, "asynFloat64")
+   field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))TIME_REMAINING")
+   field(PREC, "3")
+   field(SCAN, "I/O Intr")
+}
 
 
 ###################################################################
@@ -319,6 +327,40 @@ record(ai, "$(P)$(R)Gain_RBV")
    field(SCAN, "I/O Intr")
 }
 
+###################################################################
+#  These records control the frame type                           # 
+###################################################################
+record(mbbo, "$(P)$(R)FrameType")
+{
+   field(PINI, "1")
+   field(DTYP, "asynInt32")
+   field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FRAME_TYPE")
+   field(ZRST, "Normal")
+   field(ZRVL, "0")
+   field(ONST, "Background")
+   field(ONVL, "1")
+   field(TWST, "FlatField")
+   field(TWVL, "2")
+   field(THST, "DblCorrelation")
+   field(THVL, "2")
+}
+
+record(mbbi, "$(P)$(R)FrameType_RBV")
+{
+   field(PINI, "1")
+   field(DTYP, "asynInt32")
+   field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FRAME_TYPE")
+   field(ZRST, "Normal")
+   field(ZRVL, "0")
+   field(ONST, "Background")
+   field(ONVL, "1")
+   field(TWST, "FlatField")
+   field(TWVL, "2")
+   field(THST, "DblCorrelation")
+   field(THVL, "2")
+   field(SCAN, "I/O Intr")
+}
+
 ###################################################################
 #  These records control the acquisition mode                     # 
 ###################################################################
@@ -746,21 +788,6 @@ record(bi, "$(P)$(R)CorrectSpatial")
    field(ONAM, "Yes")
 }
 
-record(mbbo, "$(P)$(R)ImageType")
-{
-   field(VAL, "0")
-   field(ZRST, "Normal")
-   field(ONST, "Dbl correlation")
-   field(TWST, "Background")
-   field(THST, "Flatfield")
-}
-
-record(ao, "$(P)$(R)TimeRemaining")
-{
-   field(VAL, "0")
-   field(PREC, "1")
-}
-
 record(stringout, "$(P)$(R)OpenShutterStr")
 {
    field(VAL, "1")