BMT M9 Groep01 / Mbed 2 deprecated Robot2

Alles bij elkaar

Dependencies:   Encoder HIDScope MODSERIAL TouchButton mbed-dsp mbed

Diff: main.cpp

Revision:
5:8f256c16fe6c
Parent:
4:68dc27d284f7
Child:
6:34da048d7168
diff -r 68dc27d284f7 -r 8f256c16fe6c main.cpp
--- a/main.cpp	Thu Oct 30 14:29:46 2014 +0000
+++ b/main.cpp	Thu Oct 30 14:32:39 2014 +0000
@@ -635,8 +635,8 @@
     }
     if (toestand == TERUGKEREN) {
         pc.printf("motor gaat terugkeren\n\r");
-        //pid(Vreturn, motor1.getSpeed());
-        pwm_motor1.write(0.5);
+        pid(Vreturn, motor1.getSpeed());
+        pwm_motor1.write(new_pwm);
         pc.printf("new pwm %f\r\n",new_pwm);
         motordir1 = 0;
     }