Diff: main.cpp

Revision:

8:27b5468c77bc

Parent:

7:46806eb44597

Child:

9:26f75461bace

--- a/main.cpp	Fri Oct 10 12:10:52 2014 +0000
+++ b/main.cpp	Fri Oct 10 12:25:05 2014 +0000
@@ -16,8 +16,14 @@
 //Define objects
 AnalogIn    emg0(PTB0); //Biceps
 AnalogIn    emg1(PTB1); //Triceps
+PwmOut      blue(LED_BLUE);
 HIDScope scope(5);
- 
+
+arm_biquad_casd_df1_inst_f32 lowpass;
+//constants for 80Hz lowpass
+float lowpass_const[] = {0.6389437261127493, 1.2778874522254986, 0.6389437261127493, 1.1429772843080919, 0.4127976201429053};
+//state values
+float lowpass_states[4];
 arm_biquad_casd_df1_inst_f32 notch;
 //constants for 50Hz notch
 float notch_const[] = {0.5857841106784856, -1.3007020142696517e-16, 0.5857841106784856, -1.3007020142696517e-16, 0.17156822135697122};
@@ -42,6 +48,7 @@
     float filtered_emg_notch;
     float filtered_emg_low;
     float filtered_emg_abs;
+    float filtered_emg_env;
     float emg_value_f32;
     /*put raw emg value both in red and in emg_value*/
     emg_value = emg0.read_u16(); // read direct ADC result, converted to 16 bit integer (0..2^16 = 0..65536 = 0..3.3V)
@@ -50,16 +57,18 @@
     //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 );
-    filtered_emg_abs = fabs(filtered_emg_notch);
-    arm_biquad_cascade_df1_f32(&envelop, &filtered_emg_abs, &filtered_emg_low, 1 );
+    arm_biquad_cascade_df1_f32(&lowpass, &filtered_emg_notch, &filtered_emg_low, 1 );
+    filtered_emg_abs = fabs(filtered_emg_low);
+    arm_biquad_cascade_df1_f32(&envelop, &filtered_emg_abs, &filtered_emg_env, 1 );
    
-    
+    blue = emg0.read();
     /*send value to PC. */
     scope.set(0,emg_value);     //uint value
     scope.set(1,filtered_emg);  //processed float
     scope.set(2,filtered_emg_notch); 
-    scope.set(3,filtered_emg_abs); 
-    scope.set(4,filtered_emg_low);
+    scope.set(3,filtered_emg_low); 
+    scope.set(4,filtered_emg_abs);
+    scope.set(5,filtered_emg_env);
     scope.send();
  
 }
@@ -68,6 +77,7 @@
 {
     Ticker log_timer;
    //set up filters. Use external array for constants
+    arm_biquad_cascade_df1_init_f32(&lowpass,1 , lowpass_const, lowpass_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(&envelop,1 ,envelop_const, envelop_states);