Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: Encoder HIDScope MODSERIAL TouchButton mbed-dsp mbed
Revision 6:34da048d7168, committed 2014-10-30
- Comitter:
- Tanja2211
- Date:
- Thu Oct 30 14:50:35 2014 +0000
- Parent:
- 5:8f256c16fe6c
- Child:
- 7:b40bbf5be443
- Commit message:
- zonder pid;
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: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");