Diff: main.cpp

Revision:

1:15de82403661

Parent:

0:17b00659dfd2

--- a/main.cpp	Tue Oct 06 14:55:51 2015 +0000
+++ b/main.cpp	Thu Oct 15 10:29:40 2015 +0000
@@ -11,30 +11,45 @@
 // Read the analog input
 AnalogIn    ain(A0);
 
-const double a1=-1.993955222010733;
-const double a2=0.9939734363649758;
-const double b0=0.9969821645939272;
-const double b1=-1.9939643291878544;
-const double b2=0.9969821645939272;
-
 
 double v1, v2;
 
 
 
-double biquadFilter() {
+
+double biquadFilter1() {
     
-    double v = ain.read() - a1*v1 - a2*v2;
-    double y   = b0*v + b1*v1 + b2*v2;
+    double v = ain.read() - -1.50873319442*v1 - 0.87912966448*v2;
+    double y   = 0.939565*v + -1.508733463805113*v1 + 0.939565*v2;
     v2  = v1;
     v1  = v;
     return y;
     
 };
 
+double biquadFilter2() {
+    
+    double v = biquadFilter1() - -1.48309573229*v1 - 0.93337603426*v2;
+    double y   = 0.947499*v + -1.521473712007025*v1 + 0.947499*v2;
+    v2  = v1;
+    v1  = v;
+    return y;
+    
+};
+
+/*double biquadFilter3() {
+    
+    double v = biquadFilter2() - -1.61935587231*v1 - 0.94238300217*v2;
+    double y   = 0.987787*v + -1.586167324252884*v1 + 0.987787*v2;
+    v2  = v1;
+    v1  = v;
+    return y;
+    
+}; */
+
 void scopeSend()
 {
-    scope.set(0,ain);
+    scope.set(0,biquadFilter3b());
     scope.send();
     
 }