Robotics - ARM / Mbed 2 deprecated ARM_Robotics

Robot code for searching an object and charging at it.

Dependencies:   HCSR04 Motor mbed

Files at this revision

API Documentation at this revision

Revision 23:07b3c12800a6, committed 2015-06-07

Comitter:
lhartfield
Date:
Sun Jun 07 15:05:00 2015 +0000
Parent:
21:42c0db071a7f
Parent:
22:e808fb71847d
Child:
24:513c88816ed8
Commit message:
merged

Changed in this revision

functions.cpp Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/functions.cpp	Sun Jun 07 14:59:23 2015 +0000
+++ b/functions.cpp	Sun Jun 07 15:05:00 2015 +0000
@@ -145,7 +145,7 @@
     MotorRight.speed(speed);
 }
 
-void moverandom()
+void move_random(float speed)
 {
     int counter;
     int fwd_bck;
@@ -167,16 +167,16 @@
             // If fwd == 1 move forward
             if  (fwd == 1) { 
                 printf("Moving forward\n");
-                move_detect(move_forwardspeed, fwd_bck, random_time);
+                move_detect(speed, fwd_bck, random_time);
             // If fwd == 0 move bacward
             } else {
                 printf("Moving bacwards\n");
-                move_detect(-move_forwardspeed, fwd_bck, random_time);
+                move_detect(speed, fwd_bck, random_time);
             }   
         // Turn
         } else {
             printf("Turning\n");
-            move_detect(move_forwardspeed, fwd_bck, random_time);
+            move_detect(speed, fwd_bck, random_time);
         }
     }
 }

--- a/functions.h	Sun Jun 07 14:59:23 2015 +0000
+++ b/functions.h	Sun Jun 07 15:05:00 2015 +0000
@@ -16,7 +16,7 @@
 int read_line1();
 int read_line2();
 int detect_line();
-void moverandom();
+void move_random(float speed=move_forwardspeed);
 void reverse(float speed);
 void turn(float speed);
 void reverseandturn(float speed);

--- a/main.cpp	Sun Jun 07 14:59:23 2015 +0000
+++ b/main.cpp	Sun Jun 07 15:05:00 2015 +0000
@@ -125,7 +125,7 @@
 
         } else {
 
-            moverandom();
+            move_random();
 
         }