From f42cb92178239d4dcbeb8eca0939c17b4aa0e832 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Thu, 1 Jul 2010 22:28:49 +0000
Subject: [PATCH] Changes for frameType, BISStatus, etc

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@11228 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/Db/apex2.template | 65 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 6 deletions(-)

diff --git a/ADApp/Db/apex2.template b/ADApp/Db/apex2.template
index 44dd628..5ca88c3 100755
--- a/ADApp/Db/apex2.template
+++ b/ADApp/Db/apex2.template
@@ -5,6 +5,7 @@
 # Timeout waiting for SFRM file.
 record(ao, "$(P)$(R)ReadSFRMTimeout")
 {
+    field(PINI, "YES")
     field(DTYP, "asynFloat64")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))SFRM_TIMEOUT")
     field(DESC, "Timeout for SFRM file")
@@ -13,12 +14,64 @@ record(ao, "$(P)$(R)ReadSFRMTimeout")
     field(PREC, "3")
 }
 
-# Acquire command sent to BIS
-record(waveform, "$(P)$(R)apxAcqCmd")
+# Status string from BIS
+record(waveform, "$(P)$(R)BISStatus")
 {
-    field(PINI, "1")
-    field(DTYP, "asynOctetWrite")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))ACQUIRE_COMMAND")
+    field(DTYP, "asynOctetRead")
+    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))BIS_STATUS")
     field(FTVL, "UCHAR")
-    field(NELM, "256")
+    field(NELM, "512")
+    field(SCAN, "I/O Intr")
+}
+
+# We replace the file format choices from ADBase.template
+record(mbbo, "$(P)$(R)FileFormat")
+{
+    field(ZRST, "SRFM")
+    field(ZRVL, "0")
+    field(ONST, "Invalid")
+    field(ONVL, "1")
+}
+
+record(mbbi, "$(P)$(R)FileFormat_RBV")
+{
+    field(ZRST, "SRFM")
+    field(ZRVL, "0")
+    field(ONST, "Invalid")
+    field(ONVL, "1")
+    field(SCAN, "I/O Intr")
+}
+
+# We replace the choice fields for FrameType from ADBase.template
+record(mbbo, "$(P)$(R)FrameType")
+{
+   field(ZRST, "Normal")
+   field(ZRVL, "0")
+   field(ONST, "Dark")
+   field(ONVL, "1")
+   field(TWST, "Raw")
+   field(TWVL, "2")
+   field(THST, "DblCorrelation")
+   field(THVL, "3")
+}
+
+record(mbbi, "$(P)$(R)FrameType_RBV")
+{
+   field(ZRST, "Normal")
+   field(ZRVL, "0")
+   field(ONST, "Dark")
+   field(ONVL, "1")
+   field(TWST, "Raw")
+   field(TWVL, "2")
+   field(THST, "DblCorrelation")
+   field(THVL, "3")
+   field(SCAN, "I/O Intr")
+}
+
+# asyn record for interactive communication with BIS
+record(asyn, "$(P)$(R)BISAsyn")
+{
+    field(PORT,  "$(BIS_PORT)")
+    field(IMAX, "256")
+    field(OMAX, "256")
 }