ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed TempDataLogger project's DS1307 driver to simplify the function interface and prevent a possible race condition.

Browse source
This commit is contained in:
Dean Camera 2011-01-13 19:14:38 +00:00
parent 187ccb2e15
commit 7776aa4e2e
6 changed files with 90 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Projects/TempDataLogger/Lib/FATFs/diskio.c
View file

@ -83,18 +83,16 @@ DRESULT disk_ioctl (
DWORD get_fattime (void)
{
uint8_t Day, Month, Year;
uint8_t Hour, Minute, Second;
TimeDate_t CurrTimeDate;
DS1307_GetDate(&Day, &Month, &Year);
DS1307_GetTime(&Hour, &Minute, &Second);
DS1307_GetTimeDate(&CurrTimeDate);
return ((DWORD)(20 + Year) << 25) |
((DWORD)Month << 21) |
((DWORD)Day << 16) |
((DWORD)Hour << 11) |
((DWORD)Minute << 5) |
(((DWORD)Second >> 1) << 0);
return ((DWORD)(20 + CurrTimeDate.Year) << 25) |
((DWORD)CurrTimeDate.Month << 21) |
((DWORD)CurrTimeDate.Day << 16) |
((DWORD)CurrTimeDate.Hour << 11) |
((DWORD)CurrTimeDate.Minute << 5) |
(((DWORD)CurrTimeDate.Second >> 1) << 0);
}