Diff: main.cpp

Revision:

9:043f73bf5020

Parent:

8:922178e5d286

Parent:

7:49ef78d60837

Child:

11:75b6dde00307

--- a/main.cpp	Mon Jun 08 12:28:22 2020 +0000
+++ b/main.cpp	Mon Jun 08 12:32:19 2020 +0000
@@ -232,10 +232,18 @@
 
 int main()
 {
+<<<<<<< working copy
     coach.baud(115200);
     coach.puts("stl\n\r");
     coach.attach(&callback_serial, Serial::RxIrq);
 
+=======
+    
+    coach.baud(115200);
+    coach.puts("stl\n\r");
+    coach.attach(&callback_serial, Serial::RxIrq);
+    
+>>>>>>> merge rev
     //myax12.SetMode(1); //passage en Continuous rotation
 
     //char trame_cmd_speed_1[9]={0xFF,0xFF,0x01,0x5,0x3,0x20,0x10,0x0,0xC6};
@@ -286,6 +294,7 @@
     ticker_1ms.attach(&fonction_1ms,0.001);
     etat=2;
 
+<<<<<<< working copy
     coach.printf("fin_initialisation");
     position_1 = 0;
     position_2 = 0;
@@ -296,6 +305,8 @@
     delta_position_1 = 0;
     delta_position_2 = 0;
     delta_position_3 = 0;
+=======
+>>>>>>> merge rev
     while (true) {
         //on regarde la position des moteurs
         switch(etat) {