From 38a4d51519299da215b90377154fbd6db8724fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Sandstr=C3=B6m?= Date: Tue, 7 Apr 2020 16:16:55 +0200 Subject: [PATCH] Formating --- ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFT.cpp | 6 +++--- ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFTDefs.h | 2 +- ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcPluginFFT.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFT.cpp b/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFT.cpp index a934c61..94fc67b 100644 --- a/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFT.cpp +++ b/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFT.cpp @@ -161,9 +161,9 @@ void ecmcFFT::parseConfigStr(char *configStr) { pNextOption++; /* Jump to (possible) next */ } - // ECMC_PLUGIN_DBG_OPTION_CMD (1/0) - if (!strncmp(pThisOption, ECMC_PLUGIN_DBG_OPTION_CMD, strlen(ECMC_PLUGIN_DBG_OPTION_CMD))) { - pThisOption += strlen(ECMC_PLUGIN_DBG_OPTION_CMD); + // ECMC_PLUGIN_DBG_PRINT_OPTION_CMD (1/0) + if (!strncmp(pThisOption, ECMC_PLUGIN_DBG_PRINT_OPTION_CMD, strlen(ECMC_PLUGIN_DBG_PRINT_OPTION_CMD))) { + pThisOption += strlen(ECMC_PLUGIN_DBG_PRINT_OPTION_CMD); cfgDbgMode_ = atoi(pThisOption); } diff --git a/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFTDefs.h b/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFTDefs.h index 7b78194..bf3362a 100644 --- a/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFTDefs.h +++ b/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFTDefs.h @@ -15,7 +15,7 @@ #define ECMC_FFT_DEFS_H_ // Options -#define ECMC_PLUGIN_DBG_OPTION_CMD "DBG_PRINT=" +#define ECMC_PLUGIN_DBG_PRINT_OPTION_CMD "DBG_PRINT=" #define ECMC_PLUGIN_SOURCE_OPTION_CMD "SOURCE=" #define ECMC_PLUGIN_NFFT_OPTION_CMD "NFFT=" #define ECMC_PLUGIN_APPLY_SCALE_OPTION_CMD "APPLY_SCALE=" diff --git a/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcPluginFFT.c b/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcPluginFFT.c index 4b91859..3de645a 100644 --- a/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcPluginFFT.c +++ b/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcPluginFFT.c @@ -116,10 +116,10 @@ struct ecmcPluginData pluginDataDef = { // Description .desc = "FFT plugin for use with ecmc.", // Option description - .optionDesc = "\n "ECMC_PLUGIN_DBG_OPTION_CMD"<1/0> : Enables/disables printouts from plugin, default = disabled.\n" + .optionDesc = "\n "ECMC_PLUGIN_DBG_PRINT_OPTION_CMD"<1/0> : Enables/disables printouts from plugin, default = disabled.\n" " "ECMC_PLUGIN_SOURCE_OPTION_CMD" : Sets source variable for FFT (example: ec0.s1.AI_1).\n" " "ECMC_PLUGIN_NFFT_OPTION_CMD" : Data points to collect, default = 4096.\n" - " "ECMC_PLUGIN_APPLY_SCALE_OPTION_CMD"<1/0> : Apply scale, defaults to disabled.\n" + " "ECMC_PLUGIN_APPLY_SCALE_OPTION_CMD"<1/0> : Apply scale, default = disabled.\n" " "ECMC_PLUGIN_DC_REMOVE_OPTION_CMD"<1/0> : Remove DC offset of input data (SOURCE), default = disabled.\n" " "ECMC_PLUGIN_ENABLE_OPTION_CMD"<1/0> : Enable data acq. and calcs (can be controlled over asyn), default = disabled.\n" " "ECMC_PLUGIN_MODE_OPTION_CMD" : Continious or triggered mode, defaults to TRIGG\n" @@ -282,7 +282,7 @@ struct ecmcPluginData pluginDataDef = { }, /* TRIGGERED MODE = 2 */ .consts[5] = { - .constName = "fft_TRIGG", + .constName = "fft_CALC", .constDesc = "FFT Status: Calculating result", .constValue = CALC },