x

Dependencies:   Servo ServoArm mbed

Fork of PES_PIXY_Officiall by zhaw_st16b_pes2_10

Revision:
4:d611df1ed42b
Parent:
3:63da1d1fae15
Child:
5:acb938f45b9c
diff -r 63da1d1fae15 -r d611df1ed42b main.cpp
--- a/main.cpp	Fri May 26 08:01:48 2017 +0000
+++ b/main.cpp	Fri May 26 08:24:59 2017 +0000
@@ -69,8 +69,8 @@
     sam.Greifer.init(&servoGreifer);        //Greifer initialisation
     
     int state = search;
-    while(!sam.Arm.collectToBack())wait(0.075); 
-    while(!sam.Greifer.leave())wait(0.001);
+    while(!sam.Arm.collectToBack())wait(0.075f); 
+    while(!sam.Greifer.leave())wait(0.001f);
     
     //while(mybutton) wait(0.01);
 
@@ -85,6 +85,7 @@
                 }
                 else{
                     state = setPos;
+                    time = 0;
                 }
                 break;
             }
@@ -174,8 +175,10 @@
     }
 }
 int main(){
+    int start = 0;
     while( 1 ){
-        if( !mybutton  ) competition();
+        if( !mybutton ) start++;
+        if( start ) competition();
         wait(0.1f);
     }
 }
\ No newline at end of file