This commit is contained in:
2024-03-05 09:13:48 +01:00
parent 80a9ac3c14
commit bbb86ce3b4
6 changed files with 11 additions and 9 deletions

View File

@@ -4,7 +4,7 @@ record(waveform,"$(P)DAQ-${Name}-Data-Act"){
field(DESC, "Data")
field(PINI, "1")
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(INP, "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))plugin.daq.${Name}.data")
field(FTVL, "DOUBLE")
field(NELM, "${NELM}")
field(SCAN, "I/O Intr")
@@ -14,7 +14,7 @@ record(waveform,"$(P)DAQ-${Name}-Data-Act"){
record(bo,"$(P)DAQ-${Name}-Enable"){
field(DESC, "Enable")
field(DTYP, "asynInt32")
field(OUT, "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt32/plugin.daq.${Name}.enable=")
field(OUT, "@asyn(${PORT},$(ADDR=0),$(TIMEOUT=1000))plugin.daq.${Name}.enable")
field(ZNAM, "FALSE")
field(ONAM, "TRUE")
field(VAL, "0")

View File

@@ -13,7 +13,7 @@
#- Arguments
#- NAME : Name of DAQ array object
#-
#################################################################################
#-################################################################################
#- Name , Asyn port name
ecmcDAQAddArray(${NAME},ECMC.PLUGIN.DAQ.${NAME})

View File

@@ -13,6 +13,6 @@
#- Arguments
#- TYPE : Type (number of data type)
#-
#################################################################################
#-################################################################################
ecmcDAQAddChannel(${TYPE})

View File

@@ -20,6 +20,6 @@
#- The calculated time then would correspond to the first data in the array recived.\n");
#- 3 = time_ns_minus_period : Time: Raw value minus one period.\n");
#-
#################################################################################
#-################################################################################
ecmcDAQAddItem(${PARAM},${FORMAT=0})

View File

@@ -13,7 +13,7 @@
#- Arguments
#- NAME : Name of DAQ array
#-
#################################################################################
#-################################################################################
#- Connect to sources in order to know NELM.. Data sources must be known before added with the scripts..
ecmcDAQConnectToDataSource()

View File

@@ -49,6 +49,8 @@ ecmcDAQDataArray::ecmcDAQDataArray(const char* name, const char* portName)
enablePlugin_ = -1;
dataSourcesLinked_ = 0;
name_ = name;
printf("Created an array with name = %s, asynPortName = %s\n",name, portName);
}
ecmcDAQDataArray::~ecmcDAQDataArray() {
@@ -175,7 +177,7 @@ void ecmcDAQDataArray::updateAsyn() {
void ecmcDAQDataArray::initAsyn() {
// Add enable "plugin.daq.enable"
// Add enable "plugin.daq.<name>.enable"
std::string paramName =ECMC_PLUGIN_ASYN_PREFIX ".";
paramName += name_;
paramName += ".";
@@ -186,14 +188,14 @@ void ecmcDAQDataArray::initAsyn() {
}
setIntegerParam(asynEnableId_, enablePlugin_);
// Add rawdata "plugin.fft%d.rawdata"
// Add data "plugin.daq.<name>.data"
paramName =ECMC_PLUGIN_ASYN_PREFIX ".";
paramName += name_;
paramName += ".";
paramName += ECMC_PLUGIN_ASYN_RAWDATA;
if( createParam(0, paramName.c_str(), asynParamFloat64Array, &asynRawDataId_ ) != asynSuccess ) {
throw std::runtime_error("Failed create asyn parameter rawdata");
throw std::runtime_error("Failed create asyn parameter data array");
}
doCallbacksFloat64Array(buffer_, totalElementCount_, asynRawDataId_,0);