From 6f5b991f2806b063e5b28bd466d9bbb82eb25de1 Mon Sep 17 00:00:00 2001 From: Andy Piper Date: Thu, 10 Oct 2019 18:36:09 +0100 Subject: [PATCH] Filter: add harmonic notch dynamic tracking mode move definition of HNF_MAX_HARMONICS --- libraries/Filter/HarmonicNotchFilter.cpp | 7 +++---- libraries/Filter/HarmonicNotchFilter.h | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/Filter/HarmonicNotchFilter.cpp b/libraries/Filter/HarmonicNotchFilter.cpp index dce4011849..0cb29174a9 100644 --- a/libraries/Filter/HarmonicNotchFilter.cpp +++ b/libraries/Filter/HarmonicNotchFilter.cpp @@ -17,7 +17,6 @@ #include #define HNF_MAX_FILTERS 3 -#define HNF_MAX_HARMONICS 8 // table of user settable parameters const AP_Param::GroupInfo HarmonicNotchFilterParams::var_info[] = { @@ -71,9 +70,9 @@ const AP_Param::GroupInfo HarmonicNotchFilterParams::var_info[] = { // @Param: MODE // @DisplayName: Harmonic Notch Filter dynamic frequency tracking mode - // @Description: Harmonic Notch Filter dynamic frequency tracking mode. Dynamic updates can be throttle, RPM sensor or ESC telemetry based. Throttle-based updates should only be used with multicopters. - // @Range: 0 3 - // @Values: 0:Disabled,1:Throttle,2:RPM Sensor,3:ESC Telemetry + // @Description: Harmonic Notch Filter dynamic frequency tracking mode. Dynamic updates can be throttle, RPM sensor, ESC telemetry or dynamic FFT based. Throttle-based updates should only be used with multicopters. + // @Range: 0 4 + // @Values: 0:Disabled,1:Throttle,2:RPM Sensor,3:ESC Telemetry,4:Dynamic FFT // @User: Advanced AP_GROUPINFO("MODE", 7, HarmonicNotchFilterParams, _tracking_mode, 1), diff --git a/libraries/Filter/HarmonicNotchFilter.h b/libraries/Filter/HarmonicNotchFilter.h index 9c6fbfbea0..7138bb0a39 100644 --- a/libraries/Filter/HarmonicNotchFilter.h +++ b/libraries/Filter/HarmonicNotchFilter.h @@ -19,6 +19,8 @@ #include #include "NotchFilter.h" +#define HNF_MAX_HARMONICS 8 + /* a filter that manages a set of notch filters targetted at a fundamental center frequency and multiples of that fundamental frequency