Diff: functions.cpp

Revision:

21:42c0db071a7f

Parent:

20:37a89edd1cde

Child:

23:07b3c12800a6

--- a/functions.cpp	Sun Jun 07 14:18:00 2015 +0000
+++ b/functions.cpp	Sun Jun 07 14:59:23 2015 +0000
@@ -122,25 +122,25 @@
     }
 }
 
-void reverse(float speed) {
+void reverse(float speed = move_forwardspeed) {
     printf("Reverse\n");
     MotorLeft.speed(-(speed));
     MotorRight.speed(-(speed));
 }
 
-void turn(float speed) {
+void turn(float speed = move_forwardspeed) {
     printf("Turning\n");
     MotorLeft.speed(speed);
     MotorRight.speed(-(speed));
 }
 
-void reverseandturn(float speed) {
+void reverseandturn(float speed = move_forwardspeed) {
     printf("Reverse and turn\n");
     MotorLeft.speed((speed-0.3));
     MotorRight.speed(-(speed-0.1));
 }
 
-void move_forward(float speed) {
+void move_forward(float speed = move_forwardspeed) {
     MotorLeft.speed(speed);
     MotorRight.speed(speed);
 }
@@ -186,7 +186,7 @@
     MotorRight.speed(0.0);
 }
 
-int detect_object(int range, float speed) {
+int detect_object(int range_t = range, float speed = move_forwardspeed) {
     // Start a timer - finds an object for 5 seconds
     // if it doesn't find anything returns 0
     Timer usensor_t, inner_t;
@@ -205,7 +205,7 @@
         dist = usensor.get_dist_cm();
         
         // If an object is detected based on out set range return 1
-        if (dist <= range && dist >= 1) {
+        if (dist <= range_t && dist >= 1) {
             sense = 1;
             stop();
             flash_leds();