Diff: main.cpp

Revision:

37:0dbf536a95c8

Parent:

36:5d1225d72bca

Child:

38:eaf245d88d84

--- a/main.cpp	Wed Oct 28 14:11:09 2015 +0000
+++ b/main.cpp	Wed Oct 28 14:22:23 2015 +0000
@@ -233,7 +233,6 @@
             }
         }
     }
-    v = 0;
     PowerMotor.write(fabs(v));
 
     // Dan motor 2 (rotatie)
@@ -286,9 +285,9 @@
         TijdEMGCal.stop();
         TijdEMGCal.reset();
         T1 = 0.35*Max;
-        T2 = 0.6*Max;
+        T2 = 0.5*Max;
         T3 = 0.35*Max2;
-        T4 = 0.6*Max2;
+        T4 = 0.5*Max2;
         //pc.printf("T1 = %f\nT2 = %f\nT3 = %f\nT4 = %f\n", T1, T2, T3, T4);
         wait (3);
         Excecute = true;
@@ -396,7 +395,6 @@
                 timer.reset();
             }
             if (timer.read() >= 3) {
-                Home = false;
                 Errori = 0;
                 Errord = 0;
                 Errorp = 0;
@@ -405,9 +403,8 @@
                 Errorp2 = 0;
                 Fired = 0;
                 wait (3);
-                Encoder.reset();
-                Encoder2.reset();
                 Excecute = true;
+                Home = false;
             }
         }
     }