Diff: Globals/global.h

Revision:

29:41e02746041d

Parent:

18:cc5fec34ed9c

Child:

30:a1e37af4bbde

diff -r acd18776ed2d -r 41e02746041d Globals/global.h
--- a/Globals/global.h	Sat May 27 05:40:26 2017 +0000
+++ b/Globals/global.h	Fri Apr 06 13:47:19 2018 +0000
@@ -1,24 +1,46 @@
 #include "mbed.h"
+#include <CAN.h>
+#include <DirHandle.h>
+#include "SDFileSystem.h"
+
+#include "Config_big.h"
 #include "constantes.h"
 #include "ident_crac.h"
+#include "Instruction.h"
+#include "Strategie.h"
+#include "lecture_repertoire.h"
+#include "StrategieManager.h"
+#include "SerialHalfDuplex.h"
 #include "Display.h"
-#include "AX12.h"
-#include "Instruction.h"
 #include "debug.h"
 #include "Asservissement.h"
-#include "StrategieManager.h"
-#include "Strategie.h"
+#include "TS_DISCO_F469NI.h"
+#include "LCD_DISCO_F469NI.h"
+#include "fonts.h"
+#include "F469_GUI.hpp"
 #include "Telemetre.h"
-#include "SerialHalfDuplex.h"
-#include "peripheriques.h"
+#include "Config_small.h"
+#include "Config_big.h"
+#include "liaison_bluetooth.h"
+
+//#include "peripheriques.h"
 
 extern CAN can1;
+extern CAN can2;
 extern CANMessage msgRxBuffer[SIZE_FIFO];
 extern unsigned char FIFO_ecriture;
+extern char strat_sd[10][SIZE+8];
+extern char PATH[10][SIZE+8];
+
+extern signed char Strategie;
+
+extern int ack_bluetooth;
 
 extern DigitalOut led1,led2,led3,led4;
 
 extern char cheminFileStart[SIZE+8]; //Le chemin du fichier de strat, utiliser strcpy(cheminFileStart,"/local/strat.txt");
+
+
 extern struct S_Instruction strat_instructions[SIZE_BUFFER_FILE]; //La liste des instruction chargé en mémoire
 extern unsigned char nb_instructions; //Le nombre d'instruction dans le fichier de strategie
 extern unsigned char actual_instruction;//La ligne de l'instruction en cours d'execution
@@ -29,4 +51,6 @@
 
 extern unsigned short waitingAckID;//L'id du ack attendu
 extern unsigned short waitingAckFrom;//La provenance du ack attendu
-extern char modeTelemetre; // Si à 1, indique que l'on attend une reponse du telemetre 
\ No newline at end of file
+extern char modeTelemetre; // Si à 1, indique que l'on attend une reponse du telemetre 
+
+