diff --git a/configure/CONFIG_MODULE b/configure/CONFIG_MODULE index 62f560a..330e83d 100644 --- a/configure/CONFIG_MODULE +++ b/configure/CONFIG_MODULE @@ -8,8 +8,8 @@ E3_MODULE_VERSION:=master # DEPENDENT MODULE VERSION # For Example, -ECMC_DEP_VERSION:=6.2.1 -ASYN_DEP_VERSION:=4.36.0 +ECMC_DEP_VERSION:=6.2.3 +ASYN_DEP_VERSION:=4.37.0 #DEVLIB2_DEP_VERSION:=2.9.0 #PCRE_DEP_VERSION:=8.41.0 diff --git a/configure/RELEASE b/configure/RELEASE index 772abc6..fe11a22 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -1,8 +1,8 @@ # -EPICS_BASE:=/epics/base-7.0.3.1 +EPICS_BASE:=${HOME}/epics/base-7.0.4 E3_REQUIRE_NAME:=require -E3_REQUIRE_VERSION:=3.1.2 +E3_REQUIRE_VERSION:=3.2.0 # The definitions shown below can also be placed in an untracked RELEASE.local -include $(TOP)/../../RELEASE.local diff --git a/iocsh/test_plugin_FFT.script b/iocsh/test_plugin_FFT.script index e2a9ab0..556df67 100644 --- a/iocsh/test_plugin_FFT.script +++ b/iocsh/test_plugin_FFT.script @@ -7,11 +7,11 @@ epicsEnvSet("IOC" ,"$(IOC="IOC_TEST")") epicsEnvSet("ECMCCFG_INIT" ,"") #Only run startup once (auto at PSI, need call at ESS), variable set to "#" in startup.cmd epicsEnvSet("SCRIPTEXEC" ,"$(SCRIPTEXEC="iocshLoad")") -require ecmccfg master +require ecmccfg "develop" ############################################################################## ###### Startup -require ecmc "master" +require ecmc "6.2.3" require stream "${stream_VER=2.8.10}" #------------------------------------------------------------------------------- @@ -46,16 +46,16 @@ epicsEnvSet("FFT_NELM", 1024) ########################################################################s###### ## Load plugin: FFT -epicsEnvSet(ECMC_PLUGIN_FILNAME,"/epics/base-7.0.3.1/require/3.1.2/siteMods/ecmcPlugin_FFT/master/lib/${EPICS_HOST_ARCH=linux-x86_64}/libecmcPlugin_FFT.so") -epicsEnvSet(ECMC_PLUGIN_CONFIG,"SOURCE=plcs.plc0.static.sineval;DBG_PRINT=0;NFFT=1024;RATE=100;DC_REMOVE=1;APPLY_SCALE=1;MODE=CONT;") +epicsEnvSet(ECMC_PLUGIN_FILNAME,"/home/pi/epics/base-7.0.4/require/3.2.0/siteMods/ecmcPlugin_FFT/master/lib/${EPICS_HOST_ARCH=linux-x86_64}/libecmcPlugin_FFT.so") +epicsEnvSet(ECMC_PLUGIN_CONFIG,"SOURCE=plcs.plc0.static.sineval;DBG_PRINT=0;NFFT=1024;RATE=100;DC_REMOVE=1;APPLY_SCALE=1;MODE=CONT;ENABLE=1;") ${SCRIPTEXEC} ${ecmccfg_DIR}loadPlugin.cmd, "PLUGIN_ID=0,FILE=${ECMC_PLUGIN_FILNAME},CONFIG='${ECMC_PLUGIN_CONFIG}', REPORT=1" # Note: INDEX is the index of FFT object in FFT plugin and not PLUGIN_ID. In this case the same dbLoadRecords(ecmcPluginFFT.template,"P=$(IOC):,INDEX=0, NELM=${FFT_NELM}") ########################################################################s###### ## Load plugin: FFT again (will create a new FFT object in the same namespace) -epicsEnvSet(ECMC_PLUGIN_FILNAME,"/epics/base-7.0.3.1/require/3.1.2/siteMods/ecmcPlugin_FFT/master/lib/${EPICS_HOST_ARCH=linux-x86_64}/libecmcPlugin_FFT.so") -epicsEnvSet(ECMC_PLUGIN_CONFIG,"SOURCE=ecmc.thread.latency.max;DBG_PRINT=0;NFFT=1024;") +epicsEnvSet(ECMC_PLUGIN_FILNAME,"/home/pi/epics/base-7.0.4/require/3.2.0/siteMods/ecmcPlugin_FFT/master/lib/${EPICS_HOST_ARCH=linux-x86_64}/libecmcPlugin_FFT.so") +epicsEnvSet(ECMC_PLUGIN_CONFIG,"SOURCE=ecmc.thread.latency.max;DBG_PRINT=0;NFFT=1024;ENABLE=1;") ${SCRIPTEXEC} ${ecmccfg_DIR}loadPlugin.cmd, "PLUGIN_ID=1,FILE=${ECMC_PLUGIN_FILNAME},CONFIG='${ECMC_PLUGIN_CONFIG}', REPORT=1" # Note: INDEX is the index of FFT object in FFT plugin and not PLUGIN_ID. In this case the same dbLoadRecords(ecmcPluginFFT.template,"P=$(IOC):,INDEX=1, NELM=${FFT_NELM}")