Peter Bartels / Mbed 2 deprecated Main-script_groep7_V4

Laatste versie van ons script

Dependencies:   Encoder HIDScope MODSERIAL TextLCD mbed-dsp mbed

Fork of Main-script_groep7_V3 by Peter Bartels

Diff: main.cpp

Revision:
16:9e4f61aab351
Parent:
15:2d2278caf861
Child:
17:dc695e4e749b
--- a/main.cpp	Mon Nov 03 23:11:57 2014 +0000
+++ b/main.cpp	Mon Nov 03 23:19:13 2014 +0000
@@ -423,7 +423,7 @@
 
 
         case TEST: {
-            state = SLAAN;
+            state = RUST;
             break;
         }
 
@@ -444,7 +444,7 @@
                 current_herhalingen = 0;
                 previous_herhalingen = 0;
                 doel_richting = 0; 
-                state = RETURN2RUST;
+                state = SLAAN;
             }//if (current_herhalingen == 100
             break;
         }//case INSTELLEN_RICHTING
@@ -462,16 +462,19 @@
         }//case SLAAN
 
         case RETURN2RUST: {
-            //translatie(0,10,0.1);
             GotoPosition(0,0.25);
+            translatie(0,10,0.1);
             doel_richting = 0;
             doel_hoogte = 0;
-            if (current_herhalingen >= 200 && current_herhalingen_1 >= 200) {
+            if (current_herhalingen >= 200) {
+                translatie(0,10,0.1);
+                if (current_herhalingen >=200){
                 state = RUST;
                 current_herhalingen = 0;
                 previous_herhalingen = 0;
                 current_herhalingen = 0;
                 current_herhalingen = 0;
+                }
             }//if (current_herhalingen == 100)
             
             break;