CRAC Team / Mbed 2 deprecated code_carte_IHM_sans_bug

code de la carte IHM avant les bugs et avant le travail effectué avec Melchior

Dependencies:   mbed SerialHalfDuplex SDFileSystem liaison_Bluetooth ident_crac DISCO-F469NI_portrait

Diff: Strategie/Strategie.cpp

Revision:
12:227c15c7ebe6
Parent:
11:848ea39838bf
Child:
13:6b94eee81751
diff -r 848ea39838bf -r 227c15c7ebe6 Strategie/Strategie.cpp
--- a/Strategie/Strategie.cpp	Wed Mar 04 12:38:22 2020 +0000
+++ b/Strategie/Strategie.cpp	Sat Mar 07 17:36:26 2020 +0000
@@ -464,22 +464,22 @@
                     TEST_NUM.Draw(BLEU, BLANC);
                     switch(maximilien){
                     case 1:
-                    SendRawId(TEST_VENT_1);
+                    SendRawId(TEST_VENT_1_ON);
                     break;
                     case 2:
-                    SendRawId(TEST_VENT_2);
+                    SendRawId(TEST_VENT_2_ON);
                     break;
                     case 3:
-                    SendRawId(TEST_VENT_3);
+                    SendRawId(TEST_VENT_3_ON);
                     break;
                     case 4:
-                    SendRawId(TEST_VENT_4);
+                    SendRawId(TEST_VENT_4_ON);
                     break;
                     case 5:
-                    SendRawId(TEST_VENT_5);
+                    SendRawId(TEST_VENT_5_ON);
                     break;
                     case 6:
-                    SendRawId(TEST_VENT_6);
+                    SendRawId(TEST_VENT_6_ON);
                     break;
                     }
                 } else if(TEST_PLUS.Touched()) {
@@ -1485,9 +1485,9 @@
                     int tempo = 0;
                     waitingAckID= ACK_ACTION;       //On veut un ack de type action
                     waitingAckFrom = ACKNOWLEDGE_HERKULEX; //de la part des herkulex
-                    //tempo = doAction(instruction.arg1,instruction.arg2,instruction.arg3);
-                    //  unsigned char test=(unsigned char) tempo;
-                    // SendMsgCan(0x5BD, &test,1);
+                    tempo = doAction(instruction.arg1,instruction.arg2,instruction.arg3);
+                      unsigned char test=(unsigned char) tempo;
+                     
                     if(tempo == 1) {
                         //L'action est spécifique
                         if((waitingAckFrom == 0 && waitingAckID == 0) && instruction.nextActionType == ENCHAINEMENT) {
@@ -1948,8 +1948,8 @@
                 }
 
                 break;
-                case SOMO:
-                break;
+                /*case SOMO:
+                break;*/
                 default:
                 break;
                 /*