Revision 56:57a5fcfdce72, committed 2014-10-20

Comitter:

Tanja2211

Date:

Mon Oct 20 11:41:33 2014 +0000

Parent:

55:f215d954533c

Child:

57:5136d9823508

Commit message:

calibratie2

Changed in this revision

--- a/EMGfilter.cpp	Mon Oct 20 11:17:50 2014 +0000
+++ b/EMGfilter.cpp	Mon Oct 20 11:41:33 2014 +0000
@@ -13,6 +13,7 @@
 float filtered_emgB;
 float filtered_emgT;
 float MeanT1, MeanT2, MeanB1, MeanB2, MeanB3;
+float filtered_emgT10_C, filtered_emgT11_C, filtered_emgT12_C, filtered_emgT13_C, filtered_emgT14_C, filtered_emgT15_C, filtered_emgT16_C, filtered_emgT17_C, filtered_emgT18_C, filtered_emgT19_C, filtered_emgT110_C, filtered_emgT111_C, filtered_emgT112_C, filtered_emgT113_C, filtered_emgT114_C, filtered_emgT115_C, filtered_emgT116_C, filtered_emgT117_C, filtered_emgT118_C, filtered_emgT119_C;
 float B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, MOVAVG_B;
 float T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, MOVAVG_T;
 float drempelwaardeB1, drempelwaardeB2, drempelwaardeB3, drempelwaardeT1, drempelwaardeT2;
@@ -52,10 +53,10 @@
 
 pc.printf("Calibratie drempelwaarde Triceps stand 1\n");
 wait(0.5);
+{
 int i;
 int j=19;
 
-
 for (i = 0, i<=j; i ++)
 {
     /*variable to store value in*/
@@ -70,14 +71,13 @@
     arm_biquad_cascade_df1_f32(&highpass, &emg_value_f32T1i_C, &filtered_emgT1i_C, 1 );
     filtered_emgT1i_C = fabs(filtered_emgT1i_C);
     arm_biquad_cascade_df1_f32(&lowpass, &filtered_emgT1i_C, &filtered_emgT1i_C, 1 );
-}
+}}
     // Mean Triceps stand 1
-{
-    
-    MeanT1=filtered_emgT10_C*0.05+filtered_emgT11_C*0.05+filtered_emgT12_C*0.05+filtered_emgT13_C*0.05+filtered_emgT14_C*0.05+filtered_emgT15_C*0.05+filtered_emgT16_C*0.05+filtered_emgT17_C*0.05+filtered_emgT18_C*0.05+filtered_emgT19_C*0.05+filtered_emgT110_C*0.05+filtered_emgT111_C*0.05+filtered_emgT112_C*0.05+filtered_emgT113_C*0.05+filtered_emgT114_C*0.05+filtered_emgT115_C*0.05+filtered_emgT116_C*0.05+filtered_emgT117_C*0.05+filtered_emgT118_C*0.05+filtered_emgT119_C*0.05
 
     
-}
+    MeanT1=filtered_emgT10_C*0.05+filtered_emgT11_C*0.05+filtered_emgT12_C*0.05+filtered_emgT13_C*0.05+filtered_emgT14_C*0.05+filtered_emgT15_C*0.05+filtered_emgT16_C*0.05+filtered_emgT17_C*0.05+filtered_emgT18_C*0.05+filtered_emgT19_C*0.05+filtered_emgT110_C*0.05+filtered_emgT111_C*0.05+filtered_emgT112_C*0.05+filtered_emgT113_C*0.05+filtered_emgT114_C*0.05+filtered_emgT115_C*0.05+filtered_emgT116_C*0.05+filtered_emgT117_C*0.05+filtered_emgT118_C*0.05+filtered_emgT119_C*0.05;
+
+    
 
 
 
@@ -201,22 +201,17 @@
                 pc.printf("Motor 2 beweegt niet\n");
             } else {
                 pc.printf("Motor 2 gaat beweegen\n"); }
-            if (snelheidsstand==1) {
+            if (positie==1) {
                 pc.printf("Motor 2 beweegt naar positie 1\n");
             } else {
-                pc.printf("Motor 1 beweegt niet met snelheid 2\n");
-            }
-            if (snelheidsstand==3) {
-                pc.printf("Motor 1 beweegt met snelheid 3\n");
-            } else {
-                pc.printf("Motor 1 beweegt niet met snelheid 3\n");
+                pc.printf("Motor 1 beweegt niet naar positie 1\n");
             }
-    if (yT1==1) {
-        pc.printf("Motor 2 beweegt\n");
-    } else {
-        pc.printf("Motor 2 beweegt niet\n");
-    }
-    }
+            if (positie==2) {
+                pc.printf("Motor 1 beweegt naar positie 2\n");
+            } else {
+                pc.printf("Motor 1 beweegt niet naar positie 2\n");
+            }
+ 
 
     void AntwoordB() {
         drempelwaardeB1=4.99;