CRAC Team / CRAC-Strat_2017_HOMOLOGATION_PETIT_ROBOT

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of CRAC-Strat_2017_V2 by CRAC Team

Files at this revision

API Documentation at this revision

Revision 20:de595e4ff01d, committed 2017-05-24

Comitter:
ClementBreteau
Date:
Wed May 24 21:09:59 2017 +0000
Parent:
19:b4b91258c275
Commit message:
code pour l'homologation du petit robot

Changed in this revision

Strategie/Strategie.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/Strategie/Strategie.cpp	Tue May 23 13:10:05 2017 +0000
+++ b/Strategie/Strategie.cpp	Wed May 24 21:09:59 2017 +0000
@@ -603,19 +603,20 @@
 #ifdef ROBOT_BIG
             actual_instruction = instruction.nextLineError;//  2 //Modification directe... c'est pas bien mais ça marchait pour le match 5
             gameEtat = ETAT_GAME_LOAD_NEXT_INSTRUCTION;
-#else
+#else       
             actual_instruction = instruction.nextLineError;
             gameEtat = ETAT_GAME_LOAD_NEXT_INSTRUCTION; 
-#endif
+#endif      
+            gameEtat = ETAT_END;
         break;
         case ETAT_WARNING_SWITCH_STRATEGIE://Si à la fin du timeout il y a toujours un robot, passer à l'instruction d'erreur
             actual_instruction = instruction.nextLineError;
             gameEtat = ETAT_GAME_LOAD_NEXT_INSTRUCTION;
             ingnorBaliseOnce = 1;
         break;
-        
-        
-        
+            
+            
+            
         case ETAT_END: 
             if (ModeDemo){
                 gameEtat = ETAT_CHECK_CARTE_SCREEN;
@@ -629,17 +630,17 @@
             
         break;
         default:
-        
+            
         break;
-    }
-}
-
+    }       
+}           
+            
 /****************************************************************************************/
 /* FUNCTION NAME: canProcessRx                                                          */
 /* DESCRIPTION  : Fonction de traitement des messages CAN                               */
 /****************************************************************************************/
 void canProcessRx(void)
-{
+{           
     static signed char FIFO_occupation=0,FIFO_max_occupation=0;
     CANMessage msgTx=CANMessage();
     FIFO_occupation=FIFO_ecriture-FIFO_lecture;