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 8:7bf274156e1f, committed 2014-10-30
- Comitter:
- Tanja2211
- Date:
- Thu Oct 30 15:18:06 2014 +0000
- Parent:
- 7:b40bbf5be443
- Child:
- 9:ba7f541cef3a
- Commit message:
- pid 0,0,true s toegevoegd
Changed in this revision
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Thu Oct 30 15:16:04 2014 +0000
+++ b/main.cpp Thu Oct 30 15:18:06 2014 +0000
@@ -618,7 +618,8 @@
if (motor1.getPosition()>= ANGLEMIN && toestand != SLAAN) {
toestand = WACHTEN;
- //out_i=0;
+ //out_i=0;
+ pid(0,0,true);
pc.printf("if1\n");
}
if (snelheidsstand != 0 && toestand == WACHTEN && stop == 0) { // stop = 0 in het begin let op dat dit na reset nog zo is
@@ -637,6 +638,7 @@
if (toestand == SLAAN && motor1.getPosition() <= ANGLEMAX) {
pc.printf("toestand = terugkeren\n\r");
//out_i=0;
+ pid(0,0,true);
toestand = TERUGKEREN;
stop = 1; //zorgt dat hij niet weer gaat slaan tot er gereset is...
}