Diff: main.cpp

Revision:

27:ea60d12dccdf

Parent:

21:5c17b7836733

Child:

28:ac5c6350ed9a

diff -r 15cb45d56c28 -r ea60d12dccdf main.cpp
--- a/main.cpp	Mon May 11 13:48:38 2015 +0000
+++ b/main.cpp	Thu May 14 21:40:23 2015 +0000
@@ -3,7 +3,7 @@
 //#include "OSNAPprotocoleDefine.h"
 //#include "mouvement.h"
 #include "debug.h"
-//#include "Concience/InstinctPrimaire.h"
+
 #include "source/Task/TTaskCritique.h"
 #include "source/Task/TTaskAlerte.h"
 #include "source/Task/TTaskGeneral.h"
@@ -21,24 +21,9 @@
 DigitalIn mybutton(USER_BUTTON);
 DigitalOut pinA(PA_13);
 DigitalOut pinB(PA_14);
-Serial patate (PB_6, PA_10);
+
 //Serial pc(PB_10,PB_11);
 
-UART_HandleTypeDef huart3;
-void MX_USART3_UART_Init(void)
-{
-
-  huart3.Instance = USART3;
-  huart3.Init.BaudRate = 9600;
-  huart3.Init.WordLength = UART_WORDLENGTH_8B;
-  huart3.Init.StopBits = UART_STOPBITS_1;
-  huart3.Init.Parity = UART_PARITY_NONE;
-  huart3.Init.Mode = UART_MODE_TX_RX;
-  huart3.Init.HwFlowCtl = UART_HWCONTROL_NONE;
-  huart3.Init.OverSampling = UART_OVERSAMPLING_16;
-  HAL_UART_Init(&huart3);
-
-}
 
 int main()
 {
@@ -49,28 +34,28 @@
     //         string test="allo";
     //    pc.printf(test.c_str());
 
-    //TTaskCritique taskCritique(1);
+     TTaskCritique taskCritique(40);
     // TTaskAlerte taskAlerte(20);
-    // TTaskGeneral  taskGeneral(1);//40);
+     TTaskGeneral  taskGeneral(1);//40);
+wait(1);
 //////////
 // Boot //
 //////////
 
- MX_USART3_UART_Init();
- uint8_t pat[5]= {'A','l','l','o',0};
     while(1) {
-    HAL_UART_Transmit(&huart3,pat,5,5);
+
 
 
         //taskAlerte.exec();
         //taskGeneral.exec();
         if (mybutton == 0) { // Button is pressed
             //debug("Hello debug world");
-            //taskCritique.exec();
-            patate.putc(64);
+            taskCritique.exec();
+            wait(2);
+            taskGeneral.exec();
             
             
-            //taskGeneral.exec();
+            
             /*if(myled) {
                 pinB=0;
                 pinA=1;
@@ -89,6 +74,6 @@
         delete taskCritt;
     if(taskAlert)
         delete taskAlert;
-    if(taskGen)
-        delete taskGen;*/
+    if(taskGeneral)
+        delete taskGeneral;*/
 }