Diff: main.cpp

Revision:

14:ebaa515f9aea

Parent:

13:1f0ac2425368

Child:

15:0c3fb81707a7

--- a/main.cpp	Thu Oct 16 10:20:29 2014 +0000
+++ b/main.cpp	Thu Oct 16 10:24:30 2014 +0000
@@ -23,11 +23,11 @@
 float notch_const[] = {0.5857841106784856, -1.3007020142696517e-16, 0.5857841106784856, -1.3007020142696517e-16, 0.17156822135697122};
 //state values
 float notch_states[4];
-//arm_biquad_casd_df1_inst_f32 highpass;
+arm_biquad_casd_df1_inst_f32 highpass;
 //constants for 5Hz highpass
-//float highpass_const[] = {0.8948577513857248, -1.7897155027714495, 0.8948577513857248, -1.7786300789392977, 0.8008009266036016};
+float highpass_const[] = {0.8948577513857248, -1.7897155027714495, 0.8948577513857248, -1.7786300789392977, 0.8008009266036016};
 //state values
-//float highpass_states[4];
+float highpass_states[4];
 //constants for 80Hz lowpass
 //arm_biquad_casd_df1_inst_f32 lowpass;
 //float lowpass_const[] = {0.6389437261127493, 1.2778874522254986, 0.6389437261127493, 1.1429772843080919, 0.41279762014290533};
@@ -49,8 +49,8 @@
     emg_value_f32 = emg0.read();
  
     //process emg
-    //arm_biquad_cascade_df1_f32(&highpass, &emg_value_f32, &filtered_emg, 1 );
-    arm_biquad_cascade_df1_f32(&notch, &emg_value_f32, &filtered_emg_notch, 1 );
+    arm_biquad_cascade_df1_f32(&highpass, &emg_value_f32, &filtered_emg, 1 );
+    arm_biquad_cascade_df1_f32(&notch, &filtered_emg, &filtered_emg_notch, 1 );
     //arm_biquad_cascade_df1_f32(&notch, &filtered_emg_notch, &filtered_emg_lowpass, 1 );
     //filtered_emg_abs = fabs(filtered_emg_lowpass);
        
@@ -68,7 +68,7 @@
     Ticker log_timer;
    //set up filters. Use external array for constants
     arm_biquad_cascade_df1_init_f32(&notch,1 , notch_const, notch_states);
-    //arm_biquad_cascade_df1_init_f32(&highpass,1 ,highpass_const,highpass_states);
+    arm_biquad_cascade_df1_init_f32(&highpass,1 ,highpass_const,highpass_states);
     //arm_biquad_cascade_df1_init_f32(&lowpass,1 ,lowpass_const,lowpass_states);
     
     log_timer.attach(looper, 0.005);