Romain Ame / Mbed 2 deprecated Timer71pt

Fork de Timer après le match à 61 points

Dependencies:   RoboClaw mbed

Fork of Timer by ARES

Diff: main.cpp

Revision:
53:bef06d5e827d
Parent:
51:1056dd73a748
Parent:
52:98f8a6ccb6ae
Child:
54:be4ea8da9057
--- a/main.cpp	Wed May 04 16:15:13 2016 +0000
+++ b/main.cpp	Wed May 04 16:21:48 2016 +0000
@@ -58,6 +58,7 @@
 /* Debut du programme */
 int main(void)
 {
+<<<<<<< local
     logger.printf("Depart homologation !\n\r");
     homologation();
     /*drapeau = 0;
@@ -68,6 +69,13 @@
     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);