Diff: main.cpp

Revision:

34:688120048afb

Parent:

33:2f9c21ac9175

Child:

35:39e6e9941ce4

diff -r 2f9c21ac9175 -r 688120048afb main.cpp
--- a/main.cpp	Sat Nov 01 15:23:43 2014 +0000
+++ b/main.cpp	Sat Nov 01 15:28:52 2014 +0000
@@ -386,15 +386,16 @@
                 }
             }
 
-           /* Ticker looptimer1;
+            Ticker looptimer1;
             //pwm_motor1.write(0.3);
             motordir1 = 1;
             stop = 0;
             looptimer1.attach(motor1aansturing,TSAMP1);
             wait(2); ////is aan te passen (tijd die nodig is om balletje te slaan
             looptimer1.detach();
-            pc.printf("detachMotor1\n");*/
+            pc.printf("detachMotor1\n");
             
+            pid(0,0,true);
             toestand=TERUGKEREN;
             Ticker looptimer3;
             looptimer3.attach(motor1aansturingdeel2,TSAMP1);
@@ -407,8 +408,8 @@
             myled1=1;
             myled2=1;
             myled3=1;
-        }
-    }
+        } pid(0,0,true);
+    } 
     //}
 }//end int main