marijn peters / Mbed 2 deprecated EMG_filters

Dependencies:   HIDScope biquadFilter mbed

Files at this revision

API Documentation at this revision

Comitter:
marijnstudent
Date:
Fri Oct 02 09:46:41 2015 +0000
Parent:
0:a635c33123e3
Child:
2:ff71e9909646
Commit message:
in plaats van tweede orde, eerste order -> minder coefficienten waardoor de ::biquadFilter:: geen foutmelding geeft

Changed in this revision

HIDScope.lib Show annotated file Show diff for this revision Revisions of this file
biquadFilter.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/HIDScope.lib	Fri Oct 02 09:46:41 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/tomlankhorst/code/HIDScope/#5020a2c0934b
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/biquadFilter.lib	Fri Oct 02 09:46:41 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/tomlankhorst/code/biquadFilter/#e3bf917ae0a3
--- a/main.cpp	Fri Oct 02 09:28:51 2015 +0000
+++ b/main.cpp	Fri Oct 02 09:46:41 2015 +0000
@@ -1,26 +1,24 @@
 #include "mbed.h"
+#include "HIDScope.h"
 #include "biquadFilter.h"
-#include "HIDScope.h"
 
 // nummerator van het notchfilter die 50 Hz stopt (waardes komen uit MATLAB)
-double numnotch50_1 = 0.982385438526093;
-double numnotch50_2 = -3.17931708468812;
-double numnotch50_3 = 4.53709552901243;
-double numnotch50_4 = -3.17931708468812;
-double numnotch50_5 = 0.982385438526093
+const double numnotch50_1 = 0.987588938090325;
+const double numnotch50_2 = -1.59807864631545;
+const double numnotch50_3 = 0.987588938090325;
+
 // dennumerator van het notchfilter die 50 Hz stopt
-double dennotch50_1 = 1;
-double dennotch50_2 = -3.20756923909869;
-double dennotch50_3 = 4.53678523216548;
-double dennotch50_4 = -3.15106493027755;
-double dennotch50_5 = 0.965081173899138
+const double dennotch50_2 = -1.59807864631545;
+const double dennotch50_3 = 0.975177876180649;
+
 
 // filter notch50 aanmaken met de hierboven weergegeven coefficienten
-BiquadFilter notch50(numnotch50_1,numnotch50_2,numnotch50_3,numnotch50_4,numnotch50_5,dennotch50_1,dennotch50_2,dennotch50_3,dennotch50_4,dennotch50_5)
-
+biquadFilter notch50(numnotch50_1,numnotch50_2,numnotch50_3,dennotch50_2,dennotch50_3);
 
 int main()
 {
+    
+
     while (true) {
        
     }