Diff: Global.h

Revision:

30:17c84ed091b3

Parent:

21:bc8c1cec3da6

Child:

40:8a6494f61326

--- a/Global.h	Fri Feb 05 08:02:55 2016 +0000
+++ b/Global.h	Fri Feb 05 23:21:54 2016 +0000
@@ -11,32 +11,11 @@
 #include "CntrlGLD.h"
 #include "stdlib.h"
 #include "SIP.h"
-
-#include "CntrlGLD.h"
-
 #include "Parameters.h"
 #include "el_lin.h"
-
-#include "CntrlGLD.h"
-
-
-#include "CntrlGLD.h"
-#include  "commandset.h"
-
-
-
-#include "el_lin.h"
-#include "CyclesSync.h"
-#include "Parameters.h"                           
+#include "commandset.h"
 #include "Dither_Reg.h"
-#include "commandset.h"
-#include "CntrlGLD.h"
-#include "InputOutput.h"
-
-
-
-#include "stdlib.h"
-#include "console.h"
+ 
 #include "vibro.h"
 #include "QEI.h"
 #include "MTimer.h"
@@ -44,72 +23,47 @@
 #include "SPI.h"
 #include "uart_m.h"
 #include "Command.h"
-
-
-#include "mathDSP.h"
-
-#include  "CntrlGLD.h"
-#include  "CyclesSync.h"
-#include  "dspfns.h"
-#include  "SIP.h"
-#include  "el_lin.h"
+#include "dspfns.h"
+#include "ThermoCalc.h"
+ 
+ 
+   
+   
+   
 
 
-#include "InputOutput.h"
-#include "CyclesSync.h"
-#include "LPC17xx.h"
-//-------------------temp-------
-#include "el_lin.h"
 
-#include "QEI.h"
-#include "vibro.h"
-#include "MTimer.h"
-
-
-#include "mathDSP.h"
-#include "CyclesSync.h"
-#include "ThermoCalc.h"
-#include "CntrlGLD.h"
-#include "InputOutput.h"
-  #include "ThermoCalc.h"
-  #include "CyclesSync.h"
-  #include "CntrlGLD.h"
-  #include "InputOutput.h"
-
-
-#include "console.h"
  
-#include "CyclesSync.h"
 
 
 
 
 
-#include "InputOutput.h"
-#include "CyclesSync.h"
-#include "CntrlGLD.h"
-#include "stdlib.h"
-#include "SIP.h"
-#include "console.h"
+ 
+ 
+ 
+ 
+ 
+
 
 
 
-#include "mathDSP.h"
-#include "InputOutput.h"
-#include "CntrlGLD.h"
+ 
+ 
+ 
 
 
-#include "CyclesSync.h"
-#include "CntrlGLD.h"
-#include "el_lin.h"
+ 
+ 
+ 
 
 
-#include "commandset.h"
-#include "el_lin.h"
-#include "CyclesSync.h"
-#include "CntrlGLD.h"
-#include "InputOutput.h"
-#include "Parameters.h"
+ 
+ 
+ 
+ 
+ 
+ 
 
 
 
@@ -133,7 +87,7 @@
 extern void ButtonLightUP(void);
 extern unsigned long Global_Time, Time_UART,Time_Sec,Time_vibro,Time_1kHz;
 extern unsigned long MaxAmp;
-extern unsigned int  LightUpCount,BackLightCount,secPuls;
+extern unsigned int  secPuls;
 extern unsigned char BuffTemp[];
 extern unsigned char Time[];
 extern unsigned int    Event1Hz;