From 0989b969baf942f9e5b3c1ec5675286d44e6808d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Sandstr=C3=B6m?= <anders.sandstrom@esss.se>
Date: Fri, 24 Apr 2020 13:26:32 +0200
Subject: [PATCH] Rename DC_REMOVE to RM_DC

---
 README.md                                      | 18 +++++++++---------
 .../ecmcPlugin_FFTApp/src/ecmcFFTDefs.h        |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 9183345..1dea052 100644
--- a/README.md
+++ b/README.md
@@ -44,9 +44,9 @@ Note: If another plugin is loaded in between this will have no affect on these F
 The different available configuration settings:
 * SOURCE= source variable    : Sets source variable for FFT (example: ec0.s1.AI_1). This config is mandatory.
 * DBG_PRINT=1/0    : Enables/disables printouts from plugin, default = disabled.
-* NFFT= nfft        : Data points to collect, default = 4096.
+* NFFT= nfft       : Data points to collect, default = 4096.
 * APPLY_SCALE=1/0  : Apply scale, default = enabled.
-* DC_REMOVE=1/0    : Remove DC offset of input data (SOURCE), default = disabled.
+* RM_DC=1/0        : Remove DC offset of input data (SOURCE), default = disabled.
 * ENABLE=1/0       : Enable data acq. and calcs (can be controlled over asyn), default = disabled.
 * MODE=CONT/TRIGG  : Continious or triggered mode, defaults to TRIGG
 * RATE=rate in hz  : fft data sample rate in hz (must be lower than ecmc rate and (ecmc_rate/fft_rate)=integer), default = ecmc rate.
@@ -92,19 +92,19 @@ Exmaple: Enable
 "APPLY_SCALE=1;NFFT=1024;DBG_PRINT=0;SOURCE=ax1.actpos;"
 ```
 
-### DC_REMOVE
+### RM_DC
 Remove DC of input signal. Default is disabled.
 
-Exmaple: Enable
+Exmaple: Remove DC offset
 ```
-"DC_REMOVE=1;APPLY_SCALE=1;NFFT=1024;DBG_PRINT=0;SOURCE=ax1.actpos;"
+"RM_DC=1;APPLY_SCALE=1;NFFT=1024;DBG_PRINT=0;SOURCE=ax1.actpos;"
 ```
 ### ENABLE
 Enable data acq. and FFT calcs. The default settings is disabled so needs to be enabled from plc or over asyn in order to start calculations.
 
 Exmaple: Enable at startup
 ```
-"ENABLE=1;DC_REMOVE=1;APPLY_SCALE=1;NFFT=1024;DBG_PRINT=0;SOURCE=ax1.actpos;"
+"ENABLE=1;RM_DC=1;APPLY_SCALE=1;NFFT=1024;DBG_PRINT=0;SOURCE=ax1.actpos;"
 ```
 ### MODE
 The FFT module can operate in two different modes:
@@ -132,7 +132,7 @@ Triggered mode:
 
 Exmaple: Mode triggered
 ```
-"MODE=TRIGG;ENABLE=1;DC_REMOVE=1;APPLY_SCALE=1;NFFT=1024;DBG_PRINT=0;SOURCE=ax1.actpos;"
+"MODE=TRIGG;ENABLE=1;RM_DC=1;APPLY_SCALE=1;NFFT=1024;DBG_PRINT=0;SOURCE=ax1.actpos;"
 ```
 ### RATE
 Sets the sample rate of the raw input data (from data source). The default value is the ecmc rate for that data source.
@@ -140,7 +140,7 @@ Note: only a lower and "integer" division of sample rate can be defined.
 
 Exmaple: Rate = 100Hz
 ```
-RATE=100;MODE=TRIGG;ENABLE=1;DC_REMOVE=1;APPLY_SCALE=1;NFFT=1024;DBG_PRINT=0;SOURCE=ax1.actpos;"
+RATE=100;MODE=TRIGG;ENABLE=1;RM_DC=1;APPLY_SCALE=1;NFFT=1024;DBG_PRINT=0;SOURCE=ax1.actpos;"
 ```
 bMeasurese
 ## EPICS records
@@ -237,7 +237,7 @@ Plugin info:
     SOURCE=<source>    : Sets source variable for FFT (example: ec0.s1.AI_1).
     NFFT=<nfft>        : Data points to collect, default = 4096.
     APPLY_SCALE=<1/0>  : Apply scale, default = disabled.
-    DC_REMOVE=<1/0>    : Remove DC offset of input data (SOURCE), default = disabled.
+    RM_DC=<1/0>    : Remove DC offset of input data (SOURCE), default = disabled.
     ENABLE=<1/0>       : Enable data acq. and calcs (can be controlled over asyn), default = disabled.
     MODE=<CONT/TRIGG>  : Continious or triggered mode, defaults to TRIGG
     RATE=<rate in hz>  : fft data sample rate in hz (must be lower than ecmc rate and (ecmc_rate/fft_rate)=integer), default = ecmc rate.
diff --git a/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFTDefs.h b/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFTDefs.h
index bf3362a..4aecff6 100644
--- a/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFTDefs.h
+++ b/ecmcPlugin_FFT-loc/ecmcPlugin_FFTApp/src/ecmcFFTDefs.h
@@ -19,9 +19,10 @@
 #define ECMC_PLUGIN_SOURCE_OPTION_CMD      "SOURCE="
 #define ECMC_PLUGIN_NFFT_OPTION_CMD        "NFFT="
 #define ECMC_PLUGIN_APPLY_SCALE_OPTION_CMD "APPLY_SCALE="
-#define ECMC_PLUGIN_DC_REMOVE_OPTION_CMD   "DC_REMOVE="
+#define ECMC_PLUGIN_DC_REMOVE_OPTION_CMD   "RM_DC="
 #define ECMC_PLUGIN_ENABLE_OPTION_CMD      "ENABLE="
 #define ECMC_PLUGIN_RATE_OPTION_CMD        "RATE="
+
 // CONT, TRIGG
 #define ECMC_PLUGIN_MODE_OPTION_CMD        "MODE="
 #define ECMC_PLUGIN_MODE_CONT_OPTION       "CONT"