Diff: Globals/global.h

Revision:

30:a1e37af4bbde

Parent:

29:41e02746041d

Child:

31:833fc481b002

--- a/Globals/global.h	Fri Apr 06 13:47:19 2018 +0000
+++ b/Globals/global.h	Fri Apr 20 09:16:13 2018 +0000
@@ -2,7 +2,7 @@
 #include <CAN.h>
 #include <DirHandle.h>
 #include "SDFileSystem.h"
-
+#include "conv_data.h"
 #include "Config_big.h"
 #include "constantes.h"
 #include "ident_crac.h"
@@ -11,7 +11,6 @@
 #include "lecture_repertoire.h"
 #include "StrategieManager.h"
 #include "SerialHalfDuplex.h"
-#include "Display.h"
 #include "debug.h"
 #include "Asservissement.h"
 #include "TS_DISCO_F469NI.h"
@@ -21,10 +20,12 @@
 #include "Telemetre.h"
 #include "Config_small.h"
 #include "Config_big.h"
-#include "liaison_bluetooth.h"
+#include "LiaisonBluetooth.h"
 
 //#include "peripheriques.h"
-
+extern Serial pc;
+extern Serial rn42;
+extern LiaisonBluetooth liaison;
 extern CAN can1;
 extern CAN can2;
 extern CANMessage msgRxBuffer[SIZE_FIFO];
@@ -37,7 +38,7 @@
 extern int ack_bluetooth;
 
 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");
 
 
@@ -46,7 +47,7 @@
 extern unsigned char actual_instruction;//La ligne de l'instruction en cours d'execution
 
 extern unsigned short telemetreDistance;
-
+extern char couleur1, couleur2, couleur3;
 extern unsigned char InversStrat;//Si à 1, indique que l'on part de l'autre cote de la table(inversion des Y)
 
 extern unsigned short waitingAckID;//L'id du ack attendu