code de start qui marche a la fin du premier match, base pour la suite
Fork of CRAC-Strat_2017_homologation_petit_rob by
Diff: Strategie/Strategie.cpp
- Revision:
- 20:de595e4ff01d
- Parent:
- 18:cc5fec34ed9c
- Child:
- 21:590cdacb6a35
diff -r b4b91258c275 -r de595e4ff01d Strategie/Strategie.cpp --- 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;