alles in elkaar met de mooie manier van de regelaar

Dependencies:   Encoder HIDScope MODSERIAL TouchButton mbed-dsp mbed

Fork of Robot2mooiemanier by BMT M9 Groep01

Files at this revision

API Documentation at this revision

Comitter:
Tanja2211
Date:
Thu Oct 30 14:32:39 2014 +0000
Parent:
4:68dc27d284f7
Child:
6:34da048d7168
Commit message:
met new pwm

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
--- 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;
     }