motion/ecmc_plugin_fft
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add plcfunctions clear and enable

Browse Source
This commit is contained in:
Anders Sandström
2020-04-06 16:56:57 +02:00
parent 69eb833ce9
commit a051ff6a37
5 changed files with 94 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFT.cpp
View File

@@ -586,12 +586,7 @@ void ecmcFFT::initAsyn() {
asynFFTAmp_->refreshParam(1); // read once into asyn param lib
}
// // increase value of counter and refresh asyn param
// void increaseCounter(){
// counter++;
// if(paramCount){
// paramCount->refreshParamRT(0);
// // "callParamCallbacks" are handled in ecmc rt thread so don't call
// }
// }
void ecmcFFT::setEnable(int enable) {
cfgEnable_ = enable;
}

3
ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFT.h
View File

@@ -38,10 +38,11 @@ class ecmcFFT {
ecmcEcDataType dt);
// Call just before realtime because then all data sources should be available
void connectToDataSource();
void setEnable(int enable);
void clearBuffers();
private:
void parseConfigStr(char *configStr);
void clearBuffers();
void addDataToBuffer(double data);
void calcFFT();
void scaleFFT();

22
ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFTWrap.cpp
View File

@@ -66,3 +66,25 @@ int linkDataToFFTs() {
}
return 0;
}
int enableFFT(int fftIndex, int enable) {
try {
ffts.at(fftIndex)->setEnable(enable);
}
catch(std::exception& e) {
printf("Exception: %s. FFT index out of range.\n",e.what());
return ECMC_PLUGIN_FFT_ERROR_CODE;
}
return 0;
}
int clearFFT(int fftIndex) {
try {
ffts.at(fftIndex)->clearBuffers();
}
catch(std::exception& e) {
printf("Exception: %s. FFT index out of range.\n",e.what());
return ECMC_PLUGIN_FFT_ERROR_CODE;
}
return 0;
}

2
ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFTWrap.h
View File

@@ -19,6 +19,8 @@ extern "C" {
int createFFT(char *source);
int linkDataToFFTs();
void deleteAllFFTs();
int enableFFT(int fftIndex, int enable);
int clearFFT(int fftIndex);
# ifdef __cplusplus
}

76
ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcPluginFFT.c
View File

@@ -34,7 +34,7 @@ static char* lastConfStr = NULL;
* Return value other than 0 will be considered error.
* configStr can be used for configuration parameters.
**/
int adv_exampleConstruct(char *configStr)
int fft_exampleConstruct(char *configStr)
{
//This module is allowed to load several times so no need to check if loaded
@@ -46,7 +46,7 @@ int adv_exampleConstruct(char *configStr)
/** Optional function.
* Will be called once at unload.
**/
void adv_exampleDestruct(void)
void fft_exampleDestruct(void)
{
deleteAllFFTs();
if(lastConfStr){
@@ -60,7 +60,7 @@ void adv_exampleDestruct(void)
* this plugin to react on ecmc errors
* Return value other than 0 will be considered to be an error code in ecmc.
**/
int adv_exampleRealtime(int ecmcError)
int fft_exampleRealtime(int ecmcError)
{
lastEcmcError = ecmcError;
return 0;
@@ -68,7 +68,7 @@ int adv_exampleRealtime(int ecmcError)
/** Link to data source here since all sources should be availabe at this stage
**/
int adv_exampleEnterRT(){
int fft_exampleEnterRT(){
return linkDataToFFTs();
}
@@ -76,10 +76,20 @@ int adv_exampleEnterRT(){
* Will be called once just before leaving realtime mode
* Return value other than 0 will be considered error.
**/
int adv_exampleExitRT(void){
int fft_exampleExitRT(void){
return 0;
}
// Plc function for clear
double fft_clear(double index) {
return (double)clearFFT((int)index);
}
// Plc function for enable
double fft_enable(double index, double enable) {
return (double)enableFFT((int)index, (int)enable);
}
// Register data for plugin so ecmc know what to use
struct ecmcPluginData pluginDataDef = {
// Allways use ECMC_PLUG_VERSION_MAGIC
@@ -98,17 +108,61 @@ struct ecmcPluginData pluginDataDef = {
// Plugin version
.version = ECMC_EXAMPLE_PLUGIN_VERSION,
// Optional construct func, called once at load. NULL if not definded.
.constructFnc = adv_exampleConstruct,
.constructFnc = fft_exampleConstruct,
// Optional destruct func, called once at unload. NULL if not definded.
.destructFnc = adv_exampleDestruct,
.destructFnc = fft_exampleDestruct,
// Optional func that will be called each rt cycle. NULL if not definded.
.realtimeFnc = adv_exampleRealtime,
.realtimeFnc = fft_exampleRealtime,
// Optional func that will be called once just before enter realtime mode
.realtimeEnterFnc = adv_exampleEnterRT,
.realtimeEnterFnc = fft_exampleEnterRT,
// Optional func that will be called once just before exit realtime mode
.realtimeExitFnc = adv_exampleExitRT,
.realtimeExitFnc = fft_exampleExitRT,
// PLC funcs
.funcs[0] = {0}, // last element set all to zero..
.funcs[0] =
{ /*----customPlcFunc2----*/
// Function name (this is the name you use in ecmc plc-code)
.funcName = "fft_clear",
// Function description
.funcDesc = "double fft_clear(index) : Clear/reset fft[index].",
/**
* 7 different prototypes allowed (only doubles since reg in plc).
* Only funcArg${argCount} func shall be assigned the rest set to NULL.
**/
.funcArg0 = NULL,
.funcArg1 = fft_clear,
.funcArg2 = NULL,
.funcArg3 = NULL,
.funcArg4 = NULL,
.funcArg5 = NULL,
.funcArg6 = NULL,
.funcArg7 = NULL,
.funcArg8 = NULL,
.funcArg9 = NULL,
.funcArg10 = NULL,
},
.funcs[1] =
{ /*----customPlcFunc2----*/
// Function name (this is the name you use in ecmc plc-code)
.funcName = "fft_enable",
// Function description
.funcDesc = "double fft_enable(index, enable) : Set enable for fft[index].",
/**
* 7 different prototypes allowed (only doubles since reg in plc).
* Only funcArg${argCount} func shall be assigned the rest set to NULL.
**/
.funcArg0 = NULL,
.funcArg1 = NULL,
.funcArg2 = fft_enable,
.funcArg3 = NULL,
.funcArg4 = NULL,
.funcArg5 = NULL,
.funcArg6 = NULL,
.funcArg7 = NULL,
.funcArg8 = NULL,
.funcArg9 = NULL,
.funcArg10 = NULL,
},
.funcs[2] = {0}, // last element set all to zero..
// PLC consts
.consts[0] = {0}, // last element set all to zero..
};