Use ecmc 9.5.0

Db/ecmcPluginDAQ_chX.template

@@ -1,4 +1,4 @@
 record(ai,"$(P)DAQ-${Name}-CH${CH}-Type") {
-    field(DESC, "Channel Type")
+    field(DESC, "${DESC=}")
     field(VAL,  "${TYPE=0}")
 }

GNUmakefile

@@ -16,7 +16,7 @@ OPT_CXXFLAGS_YES = -O3
 
 # dependencies
 ECmasterECMC_VERSION = v1.1.0
-ecmc_VERSION = 9.4.0
+ecmc_VERSION = 9.5.0
 
 BASE_DIR = .
 SRC_DIR = $(BASE_DIR)/src

iocsh/edwin_test.script

@@ -49,35 +49,35 @@ epicsEnvSet(NAME,ToEdwin) # PREFIX:DAQ-ToEdwin-DataAct
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddArray.cmd,        "NAME=${NAME}"
 
 #- EL5021: Incremental sin/cos 1vpp
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=10"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=10,DESC='Sin/Cos 1VPP'"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s1.positionActual01"
 
 #- EL5112: Incremental (treat as array, but same timestamp twice, the second actualy not used)
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=1001"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=1001,DESC='Incremental'"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s2.timestamp01, FORMAT=1"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s2.timestamp01, FORMAT=1, SEND_OLD=1"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s2.positionActual01"
 
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=11"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=11,DESC='Incremental'"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s2.positionActual01"
 
 #- EL5042: BISS-C ch 01
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=12"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=12,DESC='BISS-C'"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s3.positionActual01"
 
 #- EL5101-0011: Incremental oversampling 
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=1000"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=1000,DESC='Incremental Oversampling'"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s4.nextSyncTime, FORMAT=2"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s4.nextSyncTime, FORMAT=1"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s4.mm.positionActualArray01"
 
 #- EL1252-0050: timestamped input ch 01
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=1"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=1,DESC='Timestamped input 5V'"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s6.timestampLatchPositive01 ,FORMAT=1"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s6.timestampLatchNegative01 ,FORMAT=1"
 
 #- ELM3602-0002: Analog input ch 01
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=1000"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=1000,DESC='Analog input +-10V'"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s7.timestamp01, FORMAT=2"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s7.timestamp01, FORMAT=1"
 ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s7.mm.analogInputArray01"

scripts/ecmcDAQAddChannel.cmd

@@ -13,10 +13,11 @@
 #- Arguments
 #- TYPE : Type (number of data type)
 #- NAME : Name of DAQ array object
+#- DESC : Optional description of channel
 #-
 #-################################################################################
 
 ecmcDAQAddChannel(${TYPE})
 epicsEnvSet(ECMC_DAQ_CURR_ITM,-1)
 ecmcEpicsEnvSetCalc("ECMC_DAQ_CURR_CH" ,${ECMC_DAQ_CURR_CH=-1}+1,"%02d")
-dbLoadRecords(ecmcPluginDAQ_chX.template,"P=${ECMC_PREFIX},Name=${NAME},PORT=ECMC.PLUGIN.DAQ.${NAME},CH=${ECMC_DAQ_CURR_CH=00},TYPE=${TYPE=0}")
+dbLoadRecords(ecmcPluginDAQ_chX.template,"P=${ECMC_PREFIX},Name=${NAME},PORT=ECMC.PLUGIN.DAQ.${NAME},CH=${ECMC_DAQ_CURR_CH=00},TYPE=${TYPE=0},DESC=${DESC=}")

src/ecmcPluginDAQ.c

@@ -53,10 +53,11 @@ int daqConstruct(char *configStr)
  **/
 void daqDestruct(void)
 {
-  deleteAllDAQs();
-  if(lastConfStr){
-    free(lastConfStr);
-  }
+  // Segfaults here during destruction?! need to check..
+  //deleteAllDAQs();
+  //if(lastConfStr){
+  //  free(lastConfStr);
+  //}
 }
 
 /** Optional function.