Code to run the microcontrollers on the R5 competition bot

Dependencies:   LineSensors mbed

Revision:
17:5046b27f5441
Parent:
16:b49db5c8e16c
Child:
18:2bd595af51d2
diff -r b49db5c8e16c -r 5046b27f5441 DriveController.cpp
--- a/DriveController.cpp	Sat Apr 18 02:50:24 2015 +0000
+++ b/DriveController.cpp	Sat Apr 18 03:02:28 2015 +0000
@@ -13,7 +13,7 @@
     
 }
 
-void DriveController::move(typename ::abs_direction direction)
+void DriveController::move(typename ::abs_direction dir)
 {
     int diff;
     bool atLine = true; //tracks whether the bot is still at the starting intersection
@@ -120,7 +120,7 @@
             || (sensorStates[4][0]&&sensorStates[5][0]&&sensorStates[6][0]&&sensorStates[7][0]);
 }
 
-void DriveController::rotate(typename ::abs_direction direction)
+void DriveController::rotate(typename ::abs_direction dir)
 {
     int diff;
     bool atLine = true;