Diff: Global.h

Revision:

231:079835d508ef

Parent:

227:2774b56bfab0

--- a/Global.h	Tue Jan 09 13:25:45 2018 +0000
+++ b/Global.h	Thu Jan 25 13:59:43 2018 +0000
@@ -3,30 +3,27 @@
 #define Global_H
 
 //#define MAX_QEI_CNT 2147483646
+//#include "dspfns.h"
 #include "LPC17xx.h" 
 #include "InputOutput.h"
-#include "CyclesSync.h"
-#include "CntrlGLD.h"
+//#include "CyclesSync.h"
 #include "stdlib.h"
+#include "stdio.h"
 #include "SIP.h"
 #include "Parameters.h"
 #include "el_lin.h"
-
-
-
+#include "time.h"
 #include "MCPWM.h"
 #include "IAP.h"
 #include "vibro.h"
 #include "QEI.h"
 #include "MTimer.h"
-
 #include "SPI.h"
 #include "uart_m.h"
 #include "Command.h"
-#include "dspfns.h"
 #include "ThermoCalc.h"
 #include "pin.h"
- 
+#include "math.h"
 
 
 
@@ -47,8 +44,8 @@
 extern unsigned int    secPuls;
 extern unsigned char   BuffTemp[];
 extern unsigned char   Time[];
-extern int BuffPLC_FILT[];
-extern unsigned int C_PLC_F;
+
+
 extern unsigned int    MODFlag;
 extern unsigned int Time250Hz;
 extern unsigned int Event250Hz;
@@ -60,12 +57,12 @@
 extern unsigned int    Event500Hz;
 
 extern unsigned int    Event1K; 
-extern unsigned int    Event5K;  
+extern unsigned int    Event10K;  
 extern unsigned int    Event100K;  
 extern unsigned int    EventVibro;
 extern unsigned int    Time1K;  
 extern unsigned int    Time1250Hz;
-extern unsigned int    Time5K; 
+extern unsigned int    Time10K; 
 extern unsigned int    Time100K;  
 extern unsigned int    Time1Hz;
 extern unsigned int    Time100Hz;
@@ -75,6 +72,10 @@
 extern __asm void boot_jump( uint32_t address );
 extern void Param_init(void);
 extern void GLD_Init(void);
+//extern int32_t convertStrToTime(char *str) ;
+
+
+extern uint32_t convertStrToTime(const char *str);
 extern void ButtonLightUP(void);
 
 //#ifndef Global_H