Revision 6:ad6d4bd69205, committed 2014-10-22

Comitter:

Tanja2211

Date:

Wed Oct 22 09:40:57 2014 +0000

Parent:

5:3232d78cb7b3

Child:

7:c13686aecc75

Commit message:

:);

Changed in this revision

--- a/main.cpp	Wed Oct 22 09:30:12 2014 +0000
+++ b/main.cpp	Wed Oct 22 09:40:57 2014 +0000
@@ -12,14 +12,12 @@
 
 //*** OBJECTS ***
 //bicep
-uint16_t emg_valueB;
 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
 int snelheidsstand;
 //tricep
-uint16_t emg_valueT;
 float filtered_emgT;
 float drempelwaardeT1, drempelwaardeT2;//T1=positie 1, T2=positie 2
 int yT1, yT2;
@@ -76,6 +74,7 @@
 //*** BICEP EMG ***
 void Biceps()
 {
+    uint16_t emg_valueB;
     float emg_value_f32B;
 
     //lezen
@@ -101,14 +100,15 @@
     B1=B0;
 
     //naar scherm
-    scope.set(0,emg_valueB);        //ruwe data
-    scope.set(1,filtered_emgB);     //filtered
+    scope.set(2,emg_valueB);        //ruwe data
+    scope.set(3,filtered_emgB);     //filtered
     scope.send();
 }
 
 // *** TRICEP EMG ***
 void Triceps()
 {
+    uint16_t emg_valueT;
     float emg_value_f32T;
 
     //lezen
@@ -133,9 +133,8 @@
     T2=T1;
     T1=T0;
 
-    scope.set(2,emg_valueT);        //ruwe data
-    scope.set(3,filtered_emgT);     //filtered
-    scope.send();
+    scope.set(0,emg_valueT);        //ruwe data
+    scope.set(1,filtered_emgT);     //filtered
 }
 
 // *** MAIN ***
@@ -224,11 +223,4 @@
             }
         }
     }
-    //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();
 }