diff --git a/Db/ecmcPluginDAQ.template b/Db/ecmcPluginDAQ.template index bc5542c..1d5103e 100644 --- a/Db/ecmcPluginDAQ.template +++ b/Db/ecmcPluginDAQ.template @@ -3,9 +3,9 @@ record(waveform,"$(P)DAQ-${Name}-Data-Act"){ info(asyn:FIFO, "1000") field(DESC, "Data") field(PINI, "1") - field(DTYP, "${RESULT_DTYP}") + field(DTYP, "asynFloat64ArrayIn") field(INP, "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))T_SMP_MS=$(T_SMP_MS=-1)/TYPE=asynFloat64ArrayIn/plugin.daq.${Name}.data?") - field(FTVL, "asynFloat64ArrayIn") + field(FTVL, "DOUBLE") field(NELM, "${NELM}") field(SCAN, "I/O Intr") field(TSE, "0") diff --git a/iocsh/test.script b/iocsh/test.script index d8354d7..63da5e5 100644 --- a/iocsh/test.script +++ b/iocsh/test.script @@ -45,7 +45,8 @@ ${SCRIPTEXEC} ${ECMC_CONFIG_ROOT}loadYamlAxis.cmd, "FILE=./cfg/axis.yaml,LIMIT=1 # require ecmc_plugin_daq sandst_a "PLUGIN_ID=0" -${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddArray.cmd, "NAME=Testing1" +epicsEnvSet(NAME,Testing1) +${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddArray.cmd, "NAME=${NAME}" ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd, "TYPE=1234" ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ec0.s13.ONE,FORMAT=2" ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ec0.s13.positionActual01" @@ -59,9 +60,10 @@ ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ec0.s13.p ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ax1.setpos" ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ax1.setpos" ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ax1.setpos" -${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQFinalizeArray.cmd "NAME=Testing1" +${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQFinalizeArray.cmd "NAME=${NAME}" -${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddArray.cmd, "NAME=Testing2" +epicsEnvSet(NAME,Testing2) +${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddArray.cmd, "NAME=${NAME}" ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd, "TYPE=1234" ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ec0.s13.ONE,FORMAT=2" ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ec0.s13.positionActual01" @@ -75,7 +77,7 @@ ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ec0.s13.p ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ax1.setpos" ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ax1.setpos" ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd, "PARAM=ax1.setpos" -${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQFinalizeArray.cmd "NAME=Testing1" +${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQFinalizeArray.cmd "NAME=${NAME}" ############################################################################## ## Configure diagnostics: diff --git a/scripts/ecmcDAQFinalizeArray.cmd b/scripts/ecmcDAQFinalizeArray.cmd index 3c23279..c236a0f 100644 --- a/scripts/ecmcDAQFinalizeArray.cmd +++ b/scripts/ecmcDAQFinalizeArray.cmd @@ -16,8 +16,6 @@ ################################################################################# #- Connect to sources in order to know NELM.. Data sources must be known before added with the scripts.. -help - ecmcDAQConnectToDataSource() #- Read NELM @@ -26,5 +24,5 @@ ecmcIf("${DAQ_NELM=-1}<0") ${IF_TRUE}ecmcExit : Failed read DAQ array NELM ecmcEndIf() -dbLoadTemplate(ecmcPluginDAQ.template,"P=${ECMC_PREFIX},Name=${NAME},NELM=${DAQ_NELM},PORT=ECMC.PLUGIN.DAQ.${NAME}") +dbLoadRecords(ecmcPluginDAQ.template,"P=${ECMC_PREFIX},Name=${NAME},NELM=${DAQ_NELM},PORT=ECMC.PLUGIN.DAQ.${NAME}") epicsEnvUnset(DAQ_NELM)