Diff: main.cpp

Revision:

7:1ca320a12035

Parent:

6:8f4138a811e0

Child:

8:6c8c94e8a72f

Child:

9:f7ec578a17c0

--- a/main.cpp	Thu Oct 16 13:34:51 2014 +0000
+++ b/main.cpp	Fri Oct 17 12:57:01 2014 +0000
@@ -24,6 +24,11 @@
 float highpass_const[] = {0.956542835577484, -1.913085671154968, 0.956542835577484, 1.911196288237583, -0.914975054072353};
 //state values
 float highpass_states[4];
+arm_biquad_casd_df1_inst_f32 notch;
+//highpass filter settings: Fc = 50 Hz, Fs = 500 Hz, Gain = -3 dB
+float notch_const[] = {0.7063988100714527, -1.1429772843080923, 0.7063988100714527, 1.1429772843080923, -0.41279762014290533};
+//state values
+float notch_states[4];
 
 //De globale variabele voor het gefilterde EMG signaal
 float filtered_biceps;
@@ -63,11 +68,13 @@
     //process emg biceps
     arm_biquad_cascade_df1_f32(&highpass, &emg_value1_f32, &filtered_biceps, 1 );
     filtered_biceps = fabs(filtered_biceps);
+    arm_biquad_cascade_df1_f32(&notch, &filtered_biceps, &filtered_biceps, 1 );
     arm_biquad_cascade_df1_f32(&lowpass, &filtered_biceps, &filtered_biceps, 1 );
 
     //process emg deltoid
     arm_biquad_cascade_df1_f32(&highpass, &emg_value2_f32, &filtered_deltoid, 1 );
     filtered_deltoid = fabs(filtered_deltoid);
+    arm_biquad_cascade_df1_f32(&notch, &filtered_deltoid, &filtered_deltoid, 1 );
     arm_biquad_cascade_df1_f32(&lowpass, &filtered_deltoid, &filtered_deltoid, 1 );
 
     /*send value to PC. */
@@ -148,9 +155,9 @@
                 while(filtered_biceps < 0.04);
                 while(filtered_biceps > 0.04) {    //Wanneer het EMG signaal een piek geeft wordt het volgende uitgevoerd.
                     BlinkRed(20);
-                    if (filtered_deltoid > 0.04) {
+                    if (filtered_deltoid > 0.1) {
                         BlinkBlue(20);
-                    } else if (filtered_biceps < 0.04 && filtered_deltoid < 0.04) {
+                    } else if (filtered_biceps < 0.04 && filtered_deltoid < 0.1) {
                         break;
                     }