Diff: testLab6.cpp

Revision:

2:dfd0d133d964

Parent:

1:bbb636a6ce10

Child:

3:e3681694d955

diff -r bbb636a6ce10 -r dfd0d133d964 testLab6.cpp
--- a/testLab6.cpp	Fri Dec 06 19:46:16 2013 +0000
+++ b/testLab6.cpp	Fri Dec 06 20:06:30 2013 +0000
@@ -20,15 +20,14 @@
         if(ir < .6) 
         {
             couleur = false;
-            printf("couleur : false\n \r");
-            Thread:: wait(1000);     
+   
         }
         else 
         {
             couleur = true; 
-            printf("couleur : true\n \r"); 
-            Thread:: wait(1000);           
+             
         }
+        Thread::wait(1000);
     }   
 }
 
@@ -39,19 +38,19 @@
    { 
         if (couleur == false)
         {
-            terminal.printf("c'est noir! (%f)", ir.read());
+            printf("c'est noir! (%f)\n \r", ir.read());
             myled = 1;
-            Thread::wait(1.5);
+            Thread::wait(500);
             myled = 0;
-            Thread::wait(1.5);
+            Thread::wait(500);
         }
         else 
         {
-            terminal.printf("c'est blanc! (%f)", ir.read());
+            printf("c'est blanc! (%f)\n \r", ir.read());
             myled2 = 1;
-            Thread::wait(1.5);
+            Thread::wait(500);
             myled2 = 0;
-            Thread::wait(1.5);
+            Thread::wait(500);
          }
    }
 }
@@ -60,13 +59,10 @@
 {
     
     init_com(BAUD9600);
-    //init_lcd();
-    //initMenu();
-    //setbgColor(
-    
+        
     
     Thread thread(lectureCapteur);
-    //Thread thread1(envoiMessage); 
+    Thread thread1(envoiMessage); 
     while(true);