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: Globals/global.h

Revision:
21:d137ec53c3a9
Parent:
19:e70b9d4a319c
Child:
22:c7763a7ec6c7
--- a/Globals/global.h	Tue Jun 23 13:31:38 2020 +0000
+++ b/Globals/global.h	Wed Jun 24 09:39:42 2020 +0000
@@ -2,14 +2,15 @@
 #define GLOBAL_H
 
 #include "mbed.h"
+
 #include "ident_crac.h"
-
+#include "constantes.h"
 
 #include <CAN.h>
 #include <DirHandle.h>
 #include "SDFileSystem.h"
 #include "conv_data.h"
-#include "constantes.h"
+
 #include "Instruction.h"
 #include "Strategie.h"
 #include "lecture_repertoire.h"
@@ -20,12 +21,13 @@
 #include "LCD_DISCO_F469NI.h"
 #include "fonts.h"
 #include "F469_GUI.hpp"
-#include "LiaisonBluetooth.h"
 #include "Evitement.h"
+#include "ihm.h"
+
 
-//#include "peripheriques.h"
 extern Serial pc;
-
+//extern E_stratGameEtat gameEtat = ETAT_CHECK_CARTES;
+//extern T_etat strat_etat_s = INIT;
 extern CAN can1;
 extern CAN can2;
 extern CANMessage msgRxBuffer[SIZE_FIFO];
@@ -34,9 +36,9 @@
 extern char PATH[10][SIZE+8];
 
 extern signed char nbStrat;
-
+extern unsigned short flag_check_carte;
 extern int ack_bluetooth;
-
+extern unsigned char Cote;
 extern DigitalOut led1,led2,led3,led4;
 extern LCD_DISCO_F469NI lcd;
 extern char cheminFileStart[SIZE+8]; //Le chemin du fichier de strat, utiliser strcpy(cheminFileStart,"/local/strat.txt");