Revision 15:e779bfbeb8ea, committed 2014-10-24

Comitter:

Tanja2211

Date:

Fri Oct 24 08:08:03 2014 +0000

Parent:

14:bebdb2ac5ec6

Child:

16:e997a6fd802a

Commit message:

Moving average 30

Changed in this revision

--- a/main.cpp	Fri Oct 24 07:44:01 2014 +0000
+++ b/main.cpp	Fri Oct 24 08:08:03 2014 +0000
@@ -17,7 +17,7 @@
 float filtered_emgB;
 float drempelwaardeB1, drempelwaardeB2, drempelwaardeB3;//B1=snelheidsstand 1, B2=snelheidsstand 2, B3=snelheidsstand 3
 int yB1, yB2, yB3;
-float B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, MOVAVG_B;//moving average objects
+float B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15, B16, B17, B18, B19, B20, B21, B22, B23, B24, B25, B26, B27, B28, B29,MOVAVG_B; //moving average objects
 int snelheidsstand;
 //tricep
 uint16_t emg_valueT;
@@ -25,7 +25,7 @@
 float filtered_emgT;
 float drempelwaardeT;
 int yT1, yT2;
-float T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, MOVAVG_T;//moving average objects
+float T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,MOVAVG_T; //moving average objects
 float MOVAVG_Positie1, MOVAVG_Positie2;
 int positie;
 
@@ -61,7 +61,26 @@
 
     //Triceps 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;
+    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;
+    T27=T26;
+    T26=T25;
+    T25=T24;
+    T24=T23;
+    T23=T22;
+    T22=T21;
+    T21=T20;
+    T19=T18;
+    T18=T17;
+    T17=T16;
+    T16=T15;
+    T15=T14;
+    T14=T13;
+    T13=T12;
+    T12=T11;
+    T11=T10;
+    T10=T9;
     T9=T8;
     T8=T7;
     T7=T6;
@@ -94,7 +113,26 @@
 
     //Biceps 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;
+    MOVAVG_B=B0*0.03333+B1*0.03333+B2*0.03333+B3*0.03333+B4*0.03333+B5*0.03333+B6*0.03333+B7*0.03333+B8*0.03333+B9*0.03333+B10*0.03333+B11*0.03333+B12*0.03333+B13*0.03333+B14*0.03333+B15*0.03333+B16*0.03333+B17*0.03333+B18*0.03333+B19*0.03333+B20*0.03333+B21*0.03333+B22*0.03333+B23*0.03333+B24*0.03333+B25*0.03333+B26*0.03333+B27*0.03333+B28*0.03333+B29*0.03333;
+    B29=B28;
+    B28=B27;
+    B27=B26;
+    B26=B25;
+    B25=B24;
+    B24=B23;
+    B23=B22;
+    B22=B21;
+    B21=B20;
+    B19=B18;
+    B18=B17;
+    B17=B16;
+    B16=B15;
+    B15=B14;
+    B14=B13;
+    B13=B12;
+    B12=B11;
+    B11=B10;
+    B10=B9;
     B9=B8;
     B8=B7;
     B7=B6;
@@ -124,16 +162,16 @@
     log_timerT1.attach(Triceps, 0.005);
     wait(60); //log_timerT wordt 2000 keer uitgevoerd
     log_timerT1.detach();
-    
+
     MOVAVG_T=MOVAVG_Positie1;
-    
+
     //bepaling van positie met tricep 2
     Ticker log_timerT2;
 
     log_timerT2.attach(Triceps, 0.005);
     wait(60);
     log_timerT2.detach();
-    
+
     MOVAVG_T=MOVAVG_Positie2;
 
     // positie van batje met behulp van Triceps
@@ -149,7 +187,7 @@
     } else {
         yT1=0;
     }
-    
+
 
     //*** INPUT MOTOR 2 ***
     positie=yT1+yT2;