Dmitry Kovalev
/
LGfiltr
forkd
Fork of LGstaandart by
Diff: MTimer.c
- Revision:
- 228:a8195e1b1123
- Parent:
- 227:2774b56bfab0
- Child:
- 231:079835d508ef
diff -r 2774b56bfab0 -r a8195e1b1123 MTimer.c --- a/MTimer.c Fri Jan 05 08:14:38 2018 +0000 +++ b/MTimer.c Tue Jan 09 13:19:26 2018 +0000 @@ -4,8 +4,10 @@ #include "vibro.h" #include "QEI.h" #include "Global.h" +#include "string.h" #include "SPI.h" #include "InputOutput.h" +#include "time.h" unsigned int CountV64=0; unsigned int CountV31=0; @@ -55,14 +57,22 @@ ///////////////////// 1Hz /////////////////////////// ///////////////////////////////////////////////////// + void Event_1Hz(void)// событие раз в 1 Гц { + + //string ster = 255; static int tempdac=0,tempdac1,JumpTimer=0; + + + // unsigned int timer; + + if (Event1Hz) { - + /* timer = time(NULL); */ - + if(Gyro.RgConA&0x4) JumpTimer=0; else { @@ -84,8 +94,13 @@ Gyro.Rate1_Event = 1; Event1Hz--; Time1Hz++; - sprintf((Time),"%d \r\n",GyroP.Str.GLD_Serial ); - WriteCon(Time); + + + /* + sprintf((Time),"\r\n %s %d %d ",__DATE__, UItempDate, FtempDate); + WriteCon(Time);*/ + /*sprintf(Time,"%s %s.",__DATE__, __TIME__ ); //Подготовка даты и времени компиляции + WriteCon(Time);*/ } }