Revision 8:54fd13779d00, committed 2014-10-22

Comitter:

Tanja2211

Date:

Wed Oct 22 10:08:24 2014 +0000

Parent:

7:c13686aecc75

Child:

9:a1890454e5a7

Commit message:

4 plaatjes :) :)

Changed in this revision

--- a/main.cpp	Wed Oct 22 09:55:39 2014 +0000
+++ b/main.cpp	Wed Oct 22 10:08:24 2014 +0000
@@ -98,34 +98,6 @@
     B3=B2;
     B2=B1;
     B1=B0;
-    
-    uint16_t emg_valueT;
-    float emg_value_f32T;
-
-    //lezen
-    emg_valueT = emgT.read_u16();
-    emg_value_f32T = emgT.read();
-
-    //filteren
-    arm_biquad_cascade_df1_f32(&highpass, &emg_value_f32T, &filtered_emgT, 1 );
-    filtered_emgT = fabs(filtered_emgT);
-    arm_biquad_cascade_df1_f32(&lowpass, &filtered_emgT, &filtered_emgT, 1 );
-
-    //moving average
-    T0=filtered_emgT;
-    MOVAVG_T=T0*0.1+T1*0.1+T2*0.1+T3*0.1+T4*0.1+T5*0.1+T6*0.1+T7*0.1+T8*0.1+T9*0.1;
-    T9=T8;
-    T8=T7;
-    T7=T6;
-    T6=T5;
-    T5=T4;
-    T4=T3;
-    T3=T2;
-    T2=T1;
-    T1=T0;
-
-    scope.set(0,emg_valueT);        //ruwe data
-    scope.set(1,filtered_emgT);     //filtered
 
     //naar scherm
     scope.set(2,emg_valueB);        //ruwe data
@@ -160,9 +132,40 @@
     T3=T2;
     T2=T1;
     T1=T0;
+    
+    uint16_t emg_valueB;
+    float emg_value_f32B;
 
-    scope.set(0,emg_valueT);        //ruwe data
-    scope.set(1,filtered_emgT);     //filtered
+    //lezen
+    emg_valueB = emgB.read_u16(); // read direct ADC result, converted to 16 bit integer (0..2^16 = 0..65536 = 0..3.3V)
+    emg_value_f32B = emgB.read();
+
+    //filteren
+    arm_biquad_cascade_df1_f32(&highpass, &emg_value_f32B, &filtered_emgB, 1 );
+    arm_biquad_cascade_df1_f32(&lowpass, &filtered_emgB, &filtered_emgB, 1 );
+    filtered_emgB = fabs(filtered_emgB);
+
+    //moving average
+    B0=filtered_emgB;
+    MOVAVG_B=B0*0.1+B1*0.1+B2*0.1+B3*0.1+B4*0.1+B5*0.1+B6*0.1+B7*0.1+B8*0.1+B9*0.1;
+    B9=B8;
+    B8=B7;
+    B7=B6;
+    B6=B5;
+    B5=B4;
+    B4=B3;
+    B3=B2;
+    B2=B1;
+    B1=B0;
+
+    //naar scherm
+    scope.set(0,emg_valueB);        //ruwe data
+    scope.set(1,filtered_emgB);     //filtered
+    
+
+    scope.set(2,emg_valueT);        //ruwe data
+    scope.set(3,filtered_emgT);     //filtered
+    scope.send();
 }
 
 // *** MAIN ***
@@ -204,12 +207,11 @@
         }
     }
     //bepaling van snelheidsstand met biceps
-    Ticker log_timerB;
+    
     arm_biquad_cascade_df1_init_f32(&lowpass,1,lowpass_const,lowpass_states);
     arm_biquad_cascade_df1_init_f32(&highpass,1,highpass_const,highpass_states);
 
-    log_timerB.attach(Biceps, 0.005);
-    while(1) {}
+
 
     drempelwaardeB1=4;
     drempelwaardeB2=6;