Diff: FilterDesign.cpp

Revision:

1:70dc835f3a37

Parent:

0:2956e3501f8a

--- a/FilterDesign.cpp	Fri Oct 21 12:11:52 2016 +0000
+++ b/FilterDesign.cpp	Fri Oct 28 08:55:20 2016 +0000
@@ -1,29 +1,47 @@
 #include "FilterDesign.h"
 #include "Filter.h"
 
+    // Notch 50 Hz
     double v1_50 = 0, v2_50 = 0;
-    const double a1_50 = -1.52337295428, a2_50 = 0.93195385841;
-    const double b0_50 = 1.00000000000, b1_50 = -1.61854514929, b2_50 = 1.00000000000;
-    const double gain_50 = 1.00000000000;
+    const double a1_50 = -1.53713228931, a2_50 = 0.90250000000;
+    const double b0_50 = 1.00000000000, b1_50 = -1.61803398875, b2_50 = 1.00000000000;
+    const double gain_50 = 0.95500000000;
+    
+    // Notch 100 Hz
+    double v1_100 = 0, v2_100 = 0;
+    const double a1_100 = -0.58713228931, a2_100 = 0.90250000000;
+    const double b0_100 = 1.00000000000, b1_100 = -0.61803398875, b2_100 = 1.00000000000;
+    const double gain_100 = 0.95200000000;
     
+    // Notch 200 Hz
+    double v1_200 = 0, v2_200 = 0;
+    const double a1_200 = 1.53713228931, a2_200 = 0.90250000000;
+    const double b0_200 = 1.00000000000, b1_200 = 1.61803398875, b2_200 = 1.00000000000;
+    const double gain_200 = 0.95500000000;
+    
+    // High pass 50 Hz 
+    double v1_HP = 0, v2_HP = 0;
+    const double a1_HP = -1.47413760026, a2_HP = 0.60062500000;
+    const double b0_HP = 1.00000000000, b1_HP = -2.00000000000, b2_HP = 1.00000000000;
+    const double gain_HP = 0.77000000000;
+    
+    // Low pass 0.7 Hz
     double v1_LP = 0, v2_LP = 0;
-    const double a1_LP = -1.93503824887, a2_LP = 0.93708289663;
+    const double a1_LP =  -1.80000000000, a2_LP = 0.81000000000;
     const double b0_LP = 1.00000000000, b1_LP = 2.00000000000, b2_LP = 1.00000000000;
-    const double gain_LP = 0.000511;
-    
-    double v1_HP = 0, v2_HP = 0;
-    const double a1_HP = -0.76475499450, a2_HP = 0.27692273367;
-    const double b0_HP = 1.00000000000, b1_HP = -2.0, b2_HP = 1.00000000000;
-    const double gain_HP = 0.510419;
+    const double gain_LP = 0.0025100000000;
 
 double FilterDesign(double u)
 {
     
     double y_50 = Filter(u,v1_50,v2_50,a1_50,a2_50,b0_50,b1_50,b2_50,gain_50);
-    double y_HP = Filter(y_50,v1_HP,v2_HP,a1_HP,a2_HP,b0_HP,b1_HP,b2_HP,gain_HP);
+    double y_100 = Filter(y_50,v1_100,v2_100,a1_100,a2_100,b0_100,b1_100,b2_100,gain_100);
+    double y_200 = Filter(y_100,v1_200,v2_200,a1_200,a2_200,b0_200,b1_200,b2_200,gain_200);
+    double y_HP = Filter(y_200,v1_HP,v2_HP,a1_HP,a2_HP,b0_HP,b1_HP,b2_HP,gain_HP);
     double y_abs = fabs(y_HP);
     double y_LP = Filter(y_abs,v1_LP,v2_LP,a1_LP,a2_LP,b0_LP,b1_LP,b2_LP,gain_LP);
-    double y = 10 + y_LP;
+    
+    double y = y_LP;
     
     return y;