Polybot / Mbed 2 deprecated mbed_ET5_TP1

TP1

Dependencies:   mbed

Diff: main.cpp

Revision:
6:2f6389d61eee
Parent:
5:2c88cabe21d3
Parent:
4:0512f3bda701
Child:
7:a1c1cb3a5d42
--- a/main.cpp	Fri Oct 09 07:34:24 2020 +0000
+++ b/main.cpp	Fri Oct 09 07:36:19 2020 +0000
@@ -27,11 +27,19 @@
     wait (0.5);*/
     pc.putc(clavier);
 
+<<<<<<< working copy
     pi.stop();
+=======
+     //pi.stop();
+>>>>>>> merge rev
     
     while(1) {
+<<<<<<< working copy
         sendInfo();
         pc.printf("COUCOU COMMENT CQ VQ ??");
+=======
+        pc.putc(clavier);
+>>>>>>> merge rev
         myled = 1;
         wait(0.2);
         myled = 0;