Add default value to DATA_FLNK

Add FLNK on data waveform
Remove pini from I/O intr
2024-06-04 09:02:56 +02:00 · 2024-06-04 08:56:48 +02:00 · 2024-05-01 09:59:33 +02:00 · 2024-05-01 09:39:13 +02:00 · 2024-05-01 09:36:43 +02:00
5 changed files with 12 additions and 10 deletions
--- a/Db/ecmcPluginDAQ.template
+++ b/Db/ecmcPluginDAQ.template
@@ -2,12 +2,12 @@
 record(waveform,"$(P)DAQ-${Name}-DataAct"){
  info(asyn:FIFO, "1000")
  field(DESC,     "Data")
-  field(PINI,     "1")
  field(DTYP,     "asynFloat64ArrayIn")
  field(INP,      "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))plugin.daq.${Name}.data")
  field(FTVL,     "DOUBLE")
  field(NELM,     "${NELM}")
  field(SCAN,     "I/O Intr")
+  field(FLNK,     "${FLNK=''}")
  field(TSE,      "0")
 }

--- a/2
+++ b/2
@@ -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
--- a/iocsh/edwin_test.script
+++ b/iocsh/edwin_test.script
@@ -82,7 +82,7 @@ ${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s7.ti
 ${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"

-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQFinalizeArray.cmd    "NAME=${NAME}"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQFinalizeArray.cmd    "NAME=${NAME},DATA_FLNK=''"

 #- To check result use  camon -t c6025a:DAQ-ToEdwin-DataAct

--- a/scripts/ecmcDAQFinalizeArray.cmd
+++ b/scripts/ecmcDAQFinalizeArray.cmd
@@ -11,8 +11,9 @@
 #-###############################################################################
 #-
 #- Arguments
-#- NAME : Name of DAQ array
-#-
+#- NAME      : Name of DAQ array
+#- DATA_FLNK : Forward link from data array (optional, default to '')
+#- 
 #-################################################################################

 #- Connect to sources in order to know NELM.. Data sources must be known before added with the scripts..
@@ -24,7 +25,7 @@ ecmcIf("${DAQ_NELM=-1}<0")
 ${IF_TRUE}ecmcExit  : Failed read DAQ array NELM
 ecmcEndIf()

-dbLoadRecords(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},FLNK=${DATA_FLNK=''}")
 epicsEnvUnset(DAQ_NELM)
 epicsEnvUnset(ECMC_DAQ_CURR_CH)
 epicsEnvUnset(ECMC_DAQ_CURR_ITM)
--- a/src/ecmcPluginDAQ.c
+++ b/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.
Author	SHA1	Message	Date
Anders Sandström	e6d5589df7	Add default value to DATA_FLNK	2024-06-04 09:02:56 +02:00
Anders Sandström	3eccabce12	Add FLNK on data waveform	2024-06-04 08:56:48 +02:00
Anders Sandström	ffc0add235	Remove pini from I/O intr	2024-05-01 09:59:33 +02:00
Anders Sandström	520521e07c	Use ecmc 9.5.0	2024-05-01 09:39:13 +02:00
Anders Sandström	1cd2c32b2d	Fix destruct error	2024-05-01 09:36:43 +02:00