Merge branch 'devel'

lnls-dig · Apr 11, 2022 · 2caeb68 · 2caeb68
2 parents f581f63 + 102e5f2
commit 2caeb68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/FOFBApp/Db/FOFBData.template b/FOFBApp/Db/FOFBData.template
@@ -56,6 +56,7 @@ record(ao,"$(S)$(RTM_CHAN)$(OFFSET)-SP"){
 record(calc,"$(S)$(RTM_CHAN)$(OFFSET)-RB"){
     field(DESC,"get waveform offset")
     field(SCAN,"Passive")
+    field(PREC,"15")
     field(INPA,"$(S)$(RTM_CHAN)$(OFFSET)-SP")
     field(CALC, "A")
     field(FLNK,"$(P)$(R)$(ACQ_NAME)ConvArrayDataC$(WVF_CHAN) CPP NMS")
@@ -72,6 +73,7 @@ record(ao,"$(S)$(RTM_CHAN)$(GAIN)-SP"){
 record(calc,"$(S)$(RTM_CHAN)$(GAIN)-RB"){
     field(DESC,"get waveform gain")
     field(SCAN,"Passive")
+    field(PREC,"15")
     field(INPA,"$(S)$(RTM_CHAN)$(GAIN)-SP")
     field(CALC, "A")
     field(FLNK,"$(P)$(R)$(ACQ_NAME)ConvArrayDataC$(WVF_CHAN) CPP NMS")

diff --git a/iocBoot/iocFOFB/stFOFB.cmd b/iocBoot/iocFOFB/stFOFB.cmd
@@ -35,20 +35,6 @@ dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM
 dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=XX:PS-FC10:, GAIN=CurrGain, OFFSET=CurrOffset, PORT=$(PORT), ADDR=10, TIMEOUT=1")
 dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=XX:PS-FC11:, GAIN=CurrGain, OFFSET=CurrOffset, PORT=$(PORT), ADDR=11, TIMEOUT=1")
 
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=M1:PS-FCH:,  GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=0,  TIMEOUT=1")
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=M1:PS-FCV:,  GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=1,  TIMEOUT=1")
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=M2:PS-FCH:,  GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=2,  TIMEOUT=1")
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=M2:PS-FCV:,  GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=3,  TIMEOUT=1")
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=C2:PS-FCH:,  GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=4,  TIMEOUT=1")
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=C2:PS-FCV:,  GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=5,  TIMEOUT=1")
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=C3:PS-FCH:,  GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=6,  TIMEOUT=1")
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=C3:PS-FCV:,  GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=7,  TIMEOUT=1")
-
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=XX:PS-FC08:, GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=8,  TIMEOUT=1")
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=XX:PS-FC09:, GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=9,  TIMEOUT=1")
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=XX:PS-FC10:, GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=10, TIMEOUT=1")
-dbLoadRecords("${TOP}/FOFBApp/Db/FOFBRtm.template", "P=${P}, R=${R}, S=${S}, RTM_CHAN=XX:PS-FC11:, GAIN=VoltGain, OFFSET=VoltOffset, PORT=$(PORT), ADDR=11, TIMEOUT=1")
-
 dbLoadRecords("${TOP}/FOFBApp/Db/FOFBCtrl.template", "P=${P}, R=${R}, FOFB_CHAN=CH0,  PORT=$(PORT), ADDR=0, TIMEOUT=1")
 dbLoadRecords("${TOP}/FOFBApp/Db/FOFBCtrl.template", "P=${P}, R=${R}, FOFB_CHAN=CH1,  PORT=$(PORT), ADDR=0, TIMEOUT=1")
 dbLoadRecords("${TOP}/FOFBApp/Db/FOFBCtrl.template", "P=${P}, R=${R}, FOFB_CHAN=CH2,  PORT=$(PORT), ADDR=0, TIMEOUT=1")