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 70:d70a6db1f635, committed 2016-05-05

Comitter:
IceTeam
Date:
Thu May 05 03:22:43 2016 +0000
Parent:
69:1b257fb65281
Child:
72:b628daa54f3c
Commit message:
Objectifs parcourus;

Changed in this revision

Map/Objectif/objectif.cpp Show annotated file Show diff for this revision Revisions of this file
Map/map.cpp Show annotated file Show diff for this revision Revisions of this file
Map/obsCarr.h Show annotated file Show diff for this revision Revisions of this file 
--- a/Map/Objectif/objectif.cpp	Thu May 05 01:29:35 2016 +0000
+++ b/Map/Objectif/objectif.cpp	Thu May 05 03:22:43 2016 +0000
@@ -31,9 +31,9 @@
 }
 
 bool objectif::obj_bloc_action () {
-	/* Range : 0 -> 10 (cm). pince.home remet à 0 */
+	/* Range : 0 -> 100 (mm). pince.home remet à 0 */
 	pince->home();
-	pince->setPos(3,0,0);
+	pince->setPos(30,0,0);
 }
 
 bool objectif::obj_para_action() {

--- a/Map/map.cpp	Thu May 05 01:29:35 2016 +0000
+++ b/Map/map.cpp	Thu May 05 03:22:43 2016 +0000
@@ -7,7 +7,7 @@
         logger.printf("map::Build_Objectives Creation des Objectifs ...\n\r");
         if (couleur == VERT) {
             addObj (objectif (OBJ_BLOC, 120, 1000, 0, Codo, Parasol, pince));
-            addObj (objectif (OBJ_BLOC, 120, 1000, 0, Codo, Parasol, pince, 10));
+            addObj (objectif (OBJ_BLOC, 120, 1000, 0, Codo, Parasol, pince, 50));
         }
         else {
             addObj (objectif (OBJ_BLOC, 3000-120, 1000, 0, Codo, Parasol, pince));

--- a/Map/obsCarr.h	Thu May 05 01:29:35 2016 +0000
+++ b/Map/obsCarr.h	Thu May 05 03:22:43 2016 +0000
@@ -5,6 +5,8 @@
 #include "figure.h"
 #include "point.h"
 
+#define TAILLE_SECURITE 110
+
 class obsCarr : public figure {
 public:
     obsCarr (float xc, float yc, float dxt, float dyt) : figure (xc,yc) {