Diff: main.cpp

Revision:

29:51308764fdd0

Parent:

28:ac5c6350ed9a

Child:

30:7305ea319fe6

diff -r ac5c6350ed9a -r 51308764fdd0 main.cpp
--- a/main.cpp	Tue Jul 28 01:22:16 2015 +0000
+++ b/main.cpp	Tue Jul 28 04:30:12 2015 +0000
@@ -1,76 +1,76 @@
-
-#include "mbed.h"
-//#include "OSNAPprotocoleDefine.h"
-//#include "mouvement.h"
-#include "debug.h"
-
-#include "source/Task/TTaskCritique.h"
-#include "source/Task/TTaskAlerte.h"
-#include "source/Task/TTaskGeneral.h"
-
-
 //------------------------------------
 // Hyperterminal configuration
 // 9600 bauds, 8-bit data, no parity
 //------------------------------------
 
+#include "mbed.h"
+//#include "OSNAPprotocoleDefine.h"
+//#include "mouvement.h"
+#include "debug.h"
+#include "settingDebug.h"
 
+#include "source/Task/TTaskCritique.h"
+#include "source/Task/TTaskAlerte.h"
+#include "source/Task/TTaskGeneral.h"
 
 DigitalOut myled(LED1, 0);
-//char str [80];
 DigitalIn mybutton(USER_BUTTON);
 DigitalOut pinA(PA_13);
 DigitalOut pinB(PA_14);
 
-//Serial pc(PB_10,PB_11);
-
-
 int main()
 {
-    //  int i = 1;
-
-    //pc.printf("Hello World !\n");
-    //pc.scanf ("%79s",str);
-    //         string test="allo";
-    //    pc.printf(test.c_str());
 wait(3);
-     TTaskCritique taskCritique(40);
-    // TTaskAlerte taskAlerte(20);
-     TTaskGeneral  taskGeneral(20);//40);
-
 //////////
 // Boot //
 //////////
 
+    #ifdef DBG_MAIN_INIT
+    debug("\n\rInit taskCritique ...");
+    #endif
+     TTaskCritique taskCritique(40);
+    #ifdef DBG_MAIN_INIT 
+    debug(" end");
+    #endif
+    
+    //#ifdef DBG_MAIN_INIT
+    //debug("\n\rInit taskAlerte ...");
+    //#endif
+    // TTaskCritique taskAlerte(20);// un-use because i dont know what to do with.
+    //#ifdef DBG_MAIN_INIT 
+    //debug(" end");
+    //#endif
+    
+    #ifdef DBG_MAIN_INIT
+    debug("\n\rInit taskGeneral ...");
+    #endif
+     TTaskCritique taskGeneral(20);
+    #ifdef DBG_MAIN_INIT 
+    debug(" end");
+    #endif
+
     while(1) {
 
-
+        #if taskCritique
+        taskCritique.exec();
+        #endif
+        
+        #if taskAlerte
+        taskAlerte.exec();
+        #endif
+        
+        #if taskGeneral
         taskGeneral.exec();
-        //taskAlerte.exec();
-        //taskGeneral.exec();
-        if (mybutton == 0) { // Button is pressed
-            //debug("Hello debug world");
-            //taskCritique.exec();
-            //wait(2);
+        #endif
+        
+        /*if (mybutton == 0) { // Button is pressed
+            debug("Hello debug world");
+            wait(2);
             
-            /*if(myled) {
-                pinB=0;
-                pinA=1;
-                
-            } else {
-                pinA=0;
-                pinB=1;
-            }*/
             myled = !myled;
             wait(1);
-        }
-        //wait(1);
-    }
+        }*/
 
-    /*if(taskCritt)
-        delete taskCritt;
-    if(taskAlert)
-        delete taskAlert;
-    if(taskGeneral)
-        delete taskGeneral;*/
-}
+    }
+    
+}
\ No newline at end of file