Daniqe Kottelenberg / Mbed 2 deprecated another_try_from_scratch_on_emg

emg with text

Dependencies:   HIDScope MODSERIAL biquadFilter mbed

Fork of emg_import by Daniqe Kottelenberg

Diff: main.cpp

Revision:
33:cd3b5168cc8f
Parent:
31:9333d3f48c88
--- a/main.cpp	Fri Oct 28 09:35:32 2016 +0000
+++ b/main.cpp	Fri Oct 28 10:13:13 2016 +0000
@@ -47,7 +47,11 @@
 //Biquads defined
 
 //b1 = biceps right arm
+<<<<<<< local
+BiQuad filterhigh_b1   (9.5654e-01,-1.9131e+00,9.5654e-01,-1.9112e+00,9.1498e-01);
+=======
 BiQuad filterhigh_b1(9.5654e-01,-1.9131e+00,9.5654e-01,-1.9112e+00,9.1498e-01);
+>>>>>>> other
 BiQuad filternotch1_b1 (9.9115e-01, -1.8853e+00, 9.9115e-01 ,-1.8909e+00  , 9.9103e-01);
 BiQuad filternotch2_b1(1.0000e+00, -1.9022e+00, 1.0000e+00,  -1.8965e+00 , 9.9127e-01);