Diff: test.cpp

Revision:

39:a5e25fd52ff8

Parent:

37:23000a47ed2b

Child:

44:edcacba44760

--- a/test.cpp	Thu Mar 13 17:49:43 2014 +0000
+++ b/test.cpp	Tue Apr 14 01:06:41 2015 +0000
@@ -237,36 +237,6 @@
     }
 }
 
-void testDriveHome()
-{
-    led1 = 1;   
-    while(!button1DefinitelyPressed())
-    {
-        updateReckonerFromEncoders();
-    }
-    
-    setLeds(1, 0, 1, 0);
-    driveHomeAlmost();
-    
-    //setLeds(0, 1, 1, 0);
-    //finalSettleIn();
-    
-    setLeds(1, 1, 1, 1);
-    infiniteReckonerReportLoop();     
-}
-
-void testFinalSettleIn()
-{
-    led1 = 1;
-    while(!button1DefinitelyPressed())
-    {
-        updateReckonerFromEncoders();
-    }   
-    finalSettleIn();
-    infiniteReckonerReportLoop();     
-}
-
-
 void testButtons()
 {
     led1 = 1;
@@ -447,14 +417,14 @@
         wait(2);
         
         motorsSpeedSet(600, 600);
-        wait(2);
+        wait(1);
         
         motorsSpeedSet(0, 0);
         led3 = 1;
         wait(2);
         
         motorsSpeedSet(1200, 1200);
-        wait(2);
+        wait(1);
     }
 }