Diff: main.cpp

Revision:

13:1f0ac2425368

Parent:

12:8a30e43337bb

Child:

14:ebaa515f9aea

--- a/main.cpp	Thu Oct 16 10:11:07 2014 +0000
+++ b/main.cpp	Thu Oct 16 10:20:29 2014 +0000
@@ -23,16 +23,16 @@
 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};
+//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()
@@ -42,7 +42,6 @@
     float filtered_emg;
     float filtered_emg_notch;
     float filtered_emg_abs;
-    float filtered_emg_env;
     float emg_value_f32;
     float filtered_emg_lowpass;
     /*put raw emg value both in red and in emg_value*/
@@ -50,10 +49,10 @@
     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, &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);
+    //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(&notch, &filtered_emg_notch, &filtered_emg_lowpass, 1 );
+    //filtered_emg_abs = fabs(filtered_emg_lowpass);
        
     
     scope.set(0,emg_value);     //uint value
@@ -69,8 +68,8 @@
     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(&lowpass,1 ,lowpass_const,lowpass_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);
     while(1) //Loop