Merge branch 'devel'

FOFBApp/Db/FOFBAcq.template

@@ -30,13 +30,15 @@ record(longout,"$(P)$(R)$(ACQ_NAME)SamplesPost-SP"){
     field(LOPR,"0")
     field(SCAN,"Passive")
     field(OUT,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))ACQ_SAMPLES_POST")
+    field(VAL, "0")
 }
 
 record(longin,"$(P)$(R)$(ACQ_NAME)SamplesPost-RB"){
     field(DTYP,"asynUInt32Digital")
     field(DESC,"Get number of post samples for waveforms")
     field(SCAN,"I/O Intr")
     field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))ACQ_SAMPLES_POST")
+    field(VAL, "0")
 }
 
 record(longout,"$(P)$(R)$(ACQ_NAME)Shots-SP"){
@@ -64,31 +66,23 @@ record(mbbo, "$(P)$(R)$(ACQ_NAME)Channel-Sel"){
     field(PINI,"YES")
     field(OUT,"@asyn($(PORT),$(ADDR),$(TIMEOUT))ACQ_CHANNEL")
     field(SCAN,"Passive")
-    field(NOBT,"3")
+    field(NOBT,"1")
     field(ZRVL,"0")
     field(ONVL,"1")
-    field(TWVL,"2")
-    field(THVL,"3")
-    field(ZRST,"adc")
-    field(ONST,"tbt")
-    field(TWST,"fofb")
-    field(THST,"monit1")
+    field(ZRST,"rtm_lamp")
+    field(ONST,"fofb")
 }
 
 record(mbbi, "$(P)$(R)$(ACQ_NAME)Channel-Sts"){
     field(DTYP, "asynInt32")
     field(DESC, "Get acquisition's channel")
     field(INP,"@asyn($(PORT),$(ADDR),$(TIMEOUT))ACQ_CHANNEL")
     field(SCAN,"I/O Intr")
-    field(NOBT,"3")
+    field(NOBT,"1")
     field(ZRVL,"0")
     field(ONVL,"1")
-    field(TWVL,"2")
-    field(THVL,"3")
-    field(ZRST,"adc")
-    field(ONST,"tbt")
-    field(TWST,"fofb")
-    field(THST,"monit1")
+    field(ZRST,"rtm_lamp")
+    field(ONST,"fofb")
 }
 
 # For use with rate seq record defined in FFTRecords.template
@@ -291,31 +285,23 @@ record(mbbo,"$(P)$(R)$(ACQ_NAME)DataTrigChan-Sel"){
     field(DESC,"set data-driven trigger channel")
     field(PINI,"YES")
     field(SCAN,"Passive")
-    field(NOBT,"3")
+    field(NOBT,"1")
     field(ZRVL,"0")
     field(ONVL,"1")
-    field(TWVL,"2")
-    field(THVL,"3")
     field(ZRST,"adc")
-    field(ONST,"tbt")
-    field(TWST,"fofb")
-    field(THST,"monit1")
+    field(ONST,"fofb")
     field(OUT,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))ACQ_DATA_TRIG_CHAN")
 }
 
 record(mbbi,"$(P)$(R)$(ACQ_NAME)DataTrigChan-Sts"){
     field(DTYP,"asynUInt32Digital")
     field(DESC,"get data-driven trigger channel")
     field(SCAN,"I/O Intr")
-    field(NOBT,"3")
+    field(NOBT,"1")
     field(ZRVL,"0")
     field(ONVL,"1")
-    field(TWVL,"2")
-    field(THVL,"3")
     field(ZRST,"adc")
-    field(ONST,"tbt")
-    field(TWST,"fofb")
-    field(THST,"monit1")
+    field(ONST,"fofb")
     field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))ACQ_DATA_TRIG_CHAN")
 }