Diff: main.cpp

Revision:

20:3ae43944846a

Parent:

19:0443e0654e8f

Child:

21:c9da9adc6706

--- a/main.cpp	Thu Oct 16 14:15:16 2014 +0000
+++ b/main.cpp	Thu Oct 16 14:22:56 2014 +0000
@@ -18,21 +18,21 @@
 AnalogIn    emg1(PTB1); //Triceps
 HIDScope scope(5);
  
-//arm_biquad_casd_df1_inst_f32 notch;
+arm_biquad_casd_df1_inst_f32 notch;
 //constants for 50Hz notch
-//float notch_const[] = {0.9695312529087462, -0.0, 0.9695312529087462, 0.0, -0.9390625058174924};
+float notch_const[] = {0.9695312529087462, -0.0, 0.9695312529087462, 0.0, -0.9390625058174924};
 //state values
-//float notch_states[4];
+float notch_states[4];
 arm_biquad_casd_df1_inst_f32 highpass;
 //constants for 5Hz highpass
 float highpass_const[] = {0.8948577513857248, -1.7897155027714495, 0.8948577513857248, 1.7786300789392977, -0.8008009266036016};
 //state values
 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};
+arm_biquad_casd_df1_inst_f32 lowpass;
+float lowpass_const[] = {0.6389437261127493, 1.2778874522254986, 0.6389437261127493, 1.1429772843080919, 0.41279762014290533};
 //state values
-//float lowpass_states[4];
+float lowpass_states[4];
 
  
 void looper()
@@ -50,10 +50,9 @@
  
     //process emg
     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);
-       
+    filtered_emg_abs = fabs(filtered_emg);
+    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 );       
     
     scope.set(0,emg_value);     //uint value
     scope.set(1,filtered_emg);  //processed float
@@ -67,9 +66,9 @@
 {
     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(&notch,1 , notch_const, notch_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);
+    arm_biquad_cascade_df1_init_f32(&lowpass,1 ,lowpass_const,lowpass_states);
     
     log_timer.attach(looper, 0.005);
     while(1) //Loop