Revision 22:0be5dfa04f75, committed 2014-10-27

Comitter:

Tanja2211

Date:

Mon Oct 27 11:22:57 2014 +0000

Parent:

21:f0357a41f43e

Child:

23:17306496ea67

Commit message:

triceps?

Changed in this revision

--- a/main.cpp	Fri Oct 24 12:46:26 2014 +0000
+++ b/main.cpp	Mon Oct 27 11:22:57 2014 +0000
@@ -67,7 +67,7 @@
     filtered_emgT = fabs(filtered_emgT);
 
     //Triceps moving average
-    T0=filtered_emgT;
+    T0=filtered_emgT*100;
     MOVAVG_T=T0*0.03333+T1*0.03333+T2*0.03333+T3*0.03333+T4*0.03333+T5*0.03333+T6*0.03333+T7*0.03333+T8*0.03333+T9*0.03333+T10*0.03333+T11*0.03333+T12*0.03333+T13*0.03333+T14*0.03333+T15*0.03333+T16*0.03333+T17*0.03333+T18*0.03333+T19*0.03333+T20*0.03333+T21*0.03333+T22*0.03333+T23*0.03333+T24*0.03333+T25*0.03333+T26*0.03333+T27*0.03333+T28*0.03333+T29*0.03333;
     T29=T28;
     T28=T27;
@@ -122,7 +122,7 @@
     filtered_emgB = fabs(filtered_emgB);
 
     //Biceps moving average
-    B0=filtered_emgB;
+    B0=filtered_emgB*1000;
     MOVAVG_B=B0*0.01667+B1*0.01667+B2*0.01667+B3*0.01667+B4*0.01667+B5*0.01667+B6*0.01667+B7*0.01667+B8*0.01667+B9*0.01667+B10*0.01667+B11*0.01667+B12*0.01667+B13*0.01667+B14*0.01667+B15*0.01667+B16*0.01667+B17*0.01667+B18*0.01667+B19*0.01667+B20*0.01667+B21*0.01667+B22*0.01667+B23*0.01667+B24*0.01667+B25*0.01667+B26*0.01667+B27*0.01667+B28*0.01667+B29*0.01667+B30*0.01667+B31*0.01667+B32*0.01667+B33*0.01667+B34*0.01667+B35*0.01667+B36*0.01667+B37*0.01667+B38*0.01667+B39*0.01667+B40*0.01667+B41*0.01667+B42*0.01667+B43*0.01667+B44*0.01667+B45*0.01667+B46*0.01667+B47*0.01667+B48*0.01667+B49*0.01667+B50*0.01667+B51*0.01667+B52*0.01667+B53*0.01667+B54*0.01667+B55*0.01667+B56*0.01667+B57*0.01667+B58*0.01667+B59*0.01667;
     B59=B58;
     B58=B57;
@@ -207,13 +207,13 @@
     arm_biquad_cascade_df1_init_f32(&highpassT,1,highpass_const,highpass_states);
 
     log_timerT1.attach(Triceps, 0.005);
-    wait(30);
+    wait(5);
     log_timerT1.detach();
 
     MOVAVG_T=MOVAVG_Positie1;
 
     // positie van batje met behulp van Triceps
-    drempelwaardeT=0.0001;
+    drempelwaardeT=0.1;
 
     if (MOVAVG_Positie1 >= drempelwaardeT) {
         yT1=1;
@@ -261,14 +261,14 @@
     arm_biquad_cascade_df1_init_f32(&highpassB,1,highpass_const,highpass_states);
 
     log_timerB.attach(Biceps,0.005);
-    wait(60);//log_timerB wordt 2000 keer uitgevoerd
+    wait(5);//log_timerB wordt 2000 keer uitgevoerd
     log_timerB.detach();
 
     //bepaling van snelheidsstand met biceps
 
-    drempelwaardeB1=0.0001;
-    drempelwaardeB2=0.001;
-    drempelwaardeB3=0.01;
+    drempelwaardeB1=2;
+    drempelwaardeB2=5;
+    drempelwaardeB3=10;
 
     if (MOVAVG_B >= drempelwaardeB1) {
         yB1=1;