Romain Ame / Mbed 2 deprecated Stressed

coucou

Dependencies:   RoboClaw mbed

Fork of Robot2016_2-0 by ARES

Diff: main.cpp

Revision:
54:be4ea8da9057
Parent:
53:bef06d5e827d
Child:
58:02dc8328975a
--- a/main.cpp	Wed May 04 16:21:48 2016 +0000
+++ b/main.cpp	Wed May 04 16:25:54 2016 +0000
@@ -58,9 +58,9 @@
 /* Debut du programme */
 int main(void)
 {
-<<<<<<< local
     logger.printf("Depart homologation !\n\r");
     homologation();
+    
     /*drapeau = 0;
     init();
 
@@ -69,13 +69,11 @@
     m.addObs(obsCarr (1500, 750, 220, 220));
     m.addObs(obsCarr (1500, 1250, 220, 220));
 
-=======
     init();    
     
     int cote = MAP_RIGHTSIDE;
     /*map m(&odo);
     m.Build(cote);
->>>>>>> other
     m.Execute(1000,1000);
     m.Execute(1500,1000);
     m.Execute(1500,1500);