Diff: Filter/FilterDesign.cpp

Revision:

10:cbcb35182ef1

Parent:

9:0e838367ab6a

--- a/Filter/FilterDesign.cpp	Fri Nov 01 10:23:02 2019 +0000
+++ b/Filter/FilterDesign.cpp	Tue Nov 05 13:23:20 2019 +0000
@@ -4,12 +4,7 @@
 
 
 
-// Notch filter on 50 Hz
-double nb0 = 0.999103206817809;
-double nb1 = -1.994263409725146;
-double nb2 = 0.999103206817809;
-double na1 = -1.994263409725146;
-double na2 = 0.998206413635618;
+
 
 // 4th order Butterworth High pass 9 Hz
 double hpb0 = 0.862550850547179;
@@ -42,8 +37,7 @@
 
 double FilterDesign(double u)
 {   
-    double y_n = notch50.step(u);       // First the notchfilter
-    double y_hp = highpass.step(y_n);   // Secondly the highpassfilter
+    double y_hp = highpass.step(y_n);   // First the highpassfilter
     double y_abs = abs(y_hp);           // Make the signal values absolute
     double y_lp = lowpass.step(y_abs);  // Then a lowpass filter
     double y_gain = y_lp*gain;          // Multiply by a gain