Diff: Robots/Strategie_big.cpp

Revision:

40:21bb685b553b

Parent:

38:76f886a1c8e6

Child:

41:b029ddc4d60e

--- a/Robots/Strategie_big.cpp	Wed May 09 19:36:42 2018 +0000
+++ b/Robots/Strategie_big.cpp	Thu May 10 18:49:25 2018 +0000
@@ -68,6 +68,7 @@
             msgTx.data[1]=couleur2;
             msgTx.data[2]=couleur3;
             msgTx.data[3]=var1;
+            msgTx.data[4]=var2;
             can2.write(msgTx);
         case 108:
             SendRawId(INTER_BAISSER_ATTRAPE_BLOC_AvG);
@@ -86,7 +87,7 @@
         case 150:
             SCORE_GR+=var1;
             SCORE_GLOBAL=SCORE_GR+SCORE_PR;
-            liaison_Tx.envoyer_short(0x30,SCORE_GLOBAL);
+            //liaison_Tx.envoyer_short(0x30,SCORE_GLOBAL);
             waitingAckFrom = 0;
             waitingAckID = 0;
             break;
@@ -114,6 +115,8 @@
         
         case 30://Action tempo
             wait_ms(var1);
+            waitingAckFrom = 0;
+            waitingAckID = 0;
         break;
         
         /*case 40: // demande au telemetre la position d'un objet