ARES / Mbed 2 deprecated Timer

Time is good

Dependencies:   RoboClaw mbed

Fork of Robot2016_2-0 by ARES

Files at this revision

API Documentation at this revision

Revision 55:dfeee9e5c0af, committed 2016-05-04

Comitter:
IceTeam
Date:
Wed May 04 16:27:51 2016 +0000
Parent:
54:be4ea8da9057
Child:
56:4fd9636dfb36
Child:
58:02dc8328975a
Commit message:
Correction bug map::Build;

Changed in this revision

Map/map.cpp Show annotated file Show diff for this revision Revisions of this file
Map/map.h Show annotated file Show diff for this revision Revisions of this file 
--- a/Map/map.cpp	Wed May 04 16:25:54 2016 +0000
+++ b/Map/map.cpp	Wed May 04 16:27:51 2016 +0000
@@ -10,7 +10,7 @@
     addObs(obsCarr (1500, 750, 1100, 15));
     addObs(obsCarr (1500, 1050, 20, 300));
     
-    if (start_type == MAP_RIGHTSIDE) { 
+    if (formation == MAP_RIGHTSIDE) { 
         addObs(obsCarr (0, 2000, 250, 150));  // Coté haut droite
         addObs(obsCarr (200, 2000, 200, 50));
         

--- a/Map/map.h	Wed May 04 16:25:54 2016 +0000
+++ b/Map/map.h	Wed May 04 16:27:51 2016 +0000
@@ -17,7 +17,7 @@
     void FindWay (point dep, point arr);
     void FindWay (float depX, float depY, float arrX, float arrY);
     void Execute (float XObjectif, float YObjectif);
-    void Build(int start_type);
+    void Build(int couleur, int formation);
     nVector<pointParcours>& getParc () { return path; }
     bool& getEnded () { return endedParc; }