X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/70d55f6e0ca1f262bd8811ad8d4149e33125819a..a032d77d0e8009a3ef7e1666f144cde6f08f800e:/Projects/TempDataLogger/Lib/DS1307.h?ds=inline diff --git a/Projects/TempDataLogger/Lib/DS1307.h b/Projects/TempDataLogger/Lib/DS1307.h index 5181c3e87..0ad0a4d92 100644 --- a/Projects/TempDataLogger/Lib/DS1307.h +++ b/Projects/TempDataLogger/Lib/DS1307.h @@ -1,5 +1,5 @@ /* - Copyright (C) Dean Camera, 2011. + Copyright (C) Dean Camera, 2012. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org @@ -12,6 +12,8 @@ #include #include + + #include "Config/AppConfig.h" /* Type Defines: */ typedef struct @@ -23,16 +25,16 @@ uint8_t Month; uint8_t Year; } TimeDate_t; - + typedef struct { union { struct { - unsigned int Sec : 4; - unsigned int TenSec : 3; - unsigned int CH : 1; + unsigned Sec : 4; + unsigned TenSec : 3; + unsigned CH : 1; } Fields; uint8_t IntVal; @@ -42,9 +44,9 @@ { struct { - unsigned int Min : 4; - unsigned int TenMin : 3; - unsigned int Reserved : 1; + unsigned Min : 4; + unsigned TenMin : 3; + unsigned Reserved : 1; } Fields; uint8_t IntVal; @@ -54,10 +56,10 @@ { struct { - unsigned int Hour : 4; - unsigned int TenHour : 2; - unsigned int TwelveHourMode : 1; - unsigned int Reserved : 1; + unsigned Hour : 4; + unsigned TenHour : 2; + unsigned TwelveHourMode : 1; + unsigned Reserved : 1; } Fields; uint8_t IntVal; @@ -67,20 +69,20 @@ { struct { - unsigned int DayOfWeek : 3; - unsigned int Reserved : 5; + unsigned DayOfWeek : 3; + unsigned Reserved : 5; } Fields; uint8_t IntVal; } Byte4; - + union { struct { - unsigned int Day : 4; - unsigned int TenDay : 2; - unsigned int Reserved : 2; + unsigned Day : 4; + unsigned TenDay : 2; + unsigned Reserved : 2; } Fields; uint8_t IntVal; @@ -90,9 +92,9 @@ { struct { - unsigned int Month : 4; - unsigned int TenMonth : 1; - unsigned int Reserved : 3; + unsigned Month : 4; + unsigned TenMonth : 1; + unsigned Reserved : 3; } Fields; uint8_t IntVal; @@ -102,8 +104,8 @@ { struct { - unsigned int Year : 4; - unsigned int TenYear : 4; + unsigned Year : 4; + unsigned TenYear : 4; } Fields; uint8_t IntVal; @@ -111,6 +113,7 @@ } DS1307_DateTimeRegs_t; /* Macros: */ + /** TWI address of the DS1307 device on the bus. */ #define DS1307_ADDRESS 0xD0 /* Function Prototypes: */