Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ffc0add235 | |||
| 520521e07c | |||
| 1cd2c32b2d |
@@ -2,7 +2,6 @@
|
||||
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")
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user