Romain Ame / Mbed 2 deprecated Stressed

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 mbed

Fork of Robot2016_2-0 by ARES

Diff: Map/map.cpp

Revision:
66:47353c8122de
Parent:
65:7bf11abfefc3
Child:
68:d19988565dfd
--- a/Map/map.cpp	Thu May 05 01:52:34 2016 +0200
+++ b/Map/map.cpp	Wed May 04 23:58:34 2016 +0000
@@ -4,16 +4,16 @@
 
 void map::Build_Objectives() {
     if (couleur == VERT) {
-        addObj (objectif (OBJ_BLOC, 120, 1000, 0, Parasol, pince));
-        addObj (objectif (OBJ_BLOC, 120, 1000, 0, Parasol, pince, 10));
+        addObj (objectif (OBJ_BLOC, 120, 1000, 0, Codo, Parasol, pince));
+        addObj (objectif (OBJ_BLOC, 120, 1000, 0, Codo, Parasol, pince, 10));
     }
     else {
-        addObj (objectif (OBJ_BLOC, 3000-120, 1000, 0, Parasol, pince));
-        addObj (objectif (OBJ_BLOC, 3000-120, 1000, 0, Parasol, pince));
+        addObj (objectif (OBJ_BLOC, 3000-120, 1000, 0, Codo, Parasol, pince));
+        addObj (objectif (OBJ_BLOC, 3000-120, 1000, 0, Codo, Parasol, pince));
     }
 }
 
-map::map (Odometry* nodo, AX12 * np, ControlleurPince * npince, int ncouleur, int nformation) : Codo(nodo), Parasol(np), ControlleurPince(npince) {
+map::map (Odometry* nodo, AX12 * np, ControlleurPince * npince, int ncouleur, int nformation) : Codo(nodo), Parasol(np), pince(npince) {
     couleur = ncouleur;
     formation = nformation;
 
@@ -222,7 +222,7 @@
     }
 }
 
-void map::Build (int couleur, int formation) {
+void map::Build () {
     if (couleur == VERT) {
         max_x_table = 1400;
         max_y_table = 1900;
@@ -327,15 +327,4 @@
 
         addObs(obsCarr (1800, 2000-350, 40, 40));   // Coquillage du milieu/bas droite
     }
-}
-
-void map::Build_Objectives() {
-    if (couleur == VERT) {
-        addObj (objectif (OBJ_BLOC, 120, 1000, 0, Parasol, pince));
-        addObj (objectif (OBJ_BLOC, 120, 1000, 0, Parasol, pince));
-    }
-    else {
-        addObj (objectif (OBJ_BLOC, 3000-120, 1000, 0, Parasol, pince));
-        addObj (objectif (OBJ_BLOC, 3000-120, 1000, 0, Parasol, pince));
-    }
 }
\ No newline at end of file