final
Dependencies: Encoder HIDScope MODSERIAL TouchButton mbed-dsp mbed
Fork of Robot1_11 by
Diff: main.cpp
- Revision:
- 6:34da048d7168
- Parent:
- 5:8f256c16fe6c
- Child:
- 7:b40bbf5be443
--- a/main.cpp Thu Oct 30 14:32:39 2014 +0000 +++ b/main.cpp Thu Oct 30 14:50:35 2014 +0000 @@ -635,7 +635,8 @@ } if (toestand == TERUGKEREN) { pc.printf("motor gaat terugkeren\n\r"); - pid(Vreturn, motor1.getSpeed()); + //pid(Vreturn, motor1.getSpeed()); + new_pwm=Vreturn; pwm_motor1.write(new_pwm); pc.printf("new pwm %f\r\n",new_pwm); motordir1 = 0; @@ -645,7 +646,7 @@ pc.printf("ifwachten\n"); } if (toestand == SLAAN) { - new_pwm = pid(setspeed, motor1.getSpeed()); + new_pwm =setspeed; //pid(setspeed, motor1.getSpeed()); motordir1 = 1; pwm_motor1.write(new_pwm); pc.printf("SLAAN\n");