Diff: source/StartUp.cpp

Revision:

57:1a395b6928ee

Parent:

38:3526c36e4c73

Child:

60:b57577b0072f

diff -r 36c290715769 -r 1a395b6928ee source/StartUp.cpp
--- a/source/StartUp.cpp	Tue Apr 18 13:43:44 2017 +0000
+++ b/source/StartUp.cpp	Tue Apr 18 15:38:15 2017 +0000
@@ -1,50 +1,41 @@
 #include "StartUp.h"
 
 
-int idel(){
-    
-    return 0;
+int idel()
+{
+    if(get_user()) {
+        return 15;
+    } else {
+        return 10;
     }
-int idel2(){
-    
-    return 0;
+}
+
+int idel2()
+{
+    if(get_user()) {
+        return 25;
+    } else {
+        return 11;
     }
-    
-    
+}
 
-int initialisation(){
-    
-    return 0;
-    }
-    
-int engage_motors(){
-    
-    return 0;
-    }
-    
-int test_servos(){
-    
+
+int initialisation()
+{
+    Robot_init_all();
+    return 16;
+}
+
+
+int inital_positioning()
+{
+
+    return 11;
+}
+
+
+int initial_turn()
+{
+
     return 0;
-    }
-    
-int inital_positioning(){
-    
-    return 0;
-    }
-    
-    
-int tart_positioning(){
-    
-    return 0;
-    }
-    
-int start_mapping(){
-    
-    return 0;
-    }
-    
-int initial_turn(){
-    
-    return 0;
-    }
-    
\ No newline at end of file
+}