Diff: main.cpp

Revision:

9:21e427de5ada

Parent:

8:63a7b61ca2ae

Child:

10:e51b4c73131a

--- a/main.cpp	Tue Oct 20 14:01:31 2015 +0000
+++ b/main.cpp	Tue Oct 20 14:08:43 2015 +0000
@@ -29,14 +29,14 @@
 double flp1_v1=0, flp1_v2=0, flp2_v1=0, flp2_v2=0;
 const double flp1_a1=-0.97922725527, flp1_a2=0.00000000000, flp1_b0= 1, flp1_b1=1, flp1_b2=0;
 const double flp2_a1=-1.97879353121, flp2_a2=0.97922951943, flp2_b0= 1, flp2_b1=2, flp2_b2=1;
-double y1, y2, y3, y4, y5, y6, y7, y8, y9, u1, u2, u3, u4, u5, u6, u7,u8 , u9 ;
+double y1, y2, y3, y4, y5, y6, y7, y8, y9, y10, y11, y12, y13, y14, y15, y16, y17, y18, y19, y20, y21, y22, y23, y24, y25, y26, y27, y28, y29, y30, y31, y32, y33, y34, y35, y36; 
+double u1, u2, u3, u4, u5, u6, u7,u8 , u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35, u36;
 double final_filter1, final_filter2, final_filter3, final_filter4;
 double fblmax = 0;
 double fbrmax = 0;
 double fllmax = 0;
 double flrmax = 0;
-
-
+double Tbl, Tbr, Tll, Tlr;
 
 // Standaard formule voor het biquad filter
 double biquad(double u, double &v1, double &v2, const double a1, const double a2, const double b0, const double b1, const double b2)
@@ -169,7 +169,7 @@
         Tbr = 0.8*fbrmax;
         Tll = 0.8*fllmax;
         Tlr = 0.8*flrmax;
-        wait (3)
+        wait (3);
     }
 }
 
@@ -187,22 +187,13 @@
 {
     EMG_Control.attach_us(Filters_EMG,1e3);
     Timer_Calibration.start();
-    if (Timer_Calibration < TimerCali) {
+    if (Timer_Calibration < TimeCali) {
         Cali = true;
     }
-    if (Timer_Calibration > TimerCali) {
+    if (Timer_Calibration > TimeCali) {
         Cali = false;
     }
     Timer_Calibration.stop();
     Timer_Calibration.reset();
 }
 
-
-
-
-}
-
-
-
-
-