Romain Ame / Mbed 2 deprecated Robot2016_2-0_STATIC

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   RoboClaw StepperMotor mbed

Fork of Robot2016_2-0 by ARES

Files at this revision

API Documentation at this revision

Revision 23:3a34b8b70da6, committed 2016-01-20

Comitter:
IceTeam
Date:
Wed Jan 20 16:06:36 2016 +0000
Parent:
22:8ce3fb39612c
Child:
24:b6e59194efba
Child:
26:6c5c453602ff
Commit message:
Test avec mpc = 100 et un objet un peu plus proche

Changed in this revision

Map/Map.cpp Show annotated file Show diff for this revision Revisions of this file
Map/Obstacles/Obs_circle.h 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/Map/Map.cpp	Wed Jan 20 14:31:37 2016 +0000
+++ b/Map/Map.cpp	Wed Jan 20 16:06:36 2016 +0000
@@ -69,7 +69,7 @@
     obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P13,1750,3000-90,30));// P13
     obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P14,1850,3000-90,30));// P14
     obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P15,1770,3000-1100,30));// P15*/
-    obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P16,1000,1000,30));// P16
+    obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P16,700,1000,1));// P16
 }
 
 int Map::getHeight(float x, float y)

--- a/Map/Obstacles/Obs_circle.h	Wed Jan 20 14:31:37 2016 +0000
+++ b/Map/Obstacles/Obs_circle.h	Wed Jan 20 16:06:36 2016 +0000
@@ -6,6 +6,8 @@
 class Obs_circle: public Obstacle
 {
     public:
+        /** Definit un obstacle de la forme d'un cercle 
+          * @param
         Obs_circle(float robotRadius, int id, float x, float y, float size);
         virtual int height(float x, float y);
         

--- a/main.cpp	Wed Jan 20 14:31:37 2016 +0000
+++ b/main.cpp	Wed Jan 20 16:06:36 2016 +0000
@@ -44,7 +44,7 @@
     init();
     //Construction des obstacles
     map.build();
-    map.AStar(0, 1000, 2000, 1000, 300);
+    map.AStar(0, 1000, 2000, 1000, 100);
     path = map.path;
     
     for(int i=0; i<path.size();i++) {