X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/cb779e3d7d32d7c43e0a45bb526de0a04135b0c7..279e1b6ece7fbc90db6cb642f1c289b45648cf9c:/Projects/TempDataLogger/Lib/DS1307.h

diff --git a/Projects/TempDataLogger/Lib/DS1307.h b/Projects/TempDataLogger/Lib/DS1307.h
index 87c6229f6..5181c3e87 100644
--- a/Projects/TempDataLogger/Lib/DS1307.h
+++ b/Projects/TempDataLogger/Lib/DS1307.h
@@ -1,5 +1,5 @@
 /*
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
@@ -16,6 +16,16 @@
 	/* Type Defines: */
 		typedef struct
 		{
+			uint8_t Hour;
+			uint8_t Minute;
+			uint8_t Second;
+			uint8_t Day;
+			uint8_t Month;
+			uint8_t Year;
+		} TimeDate_t;
+	
+		typedef struct
+		{
 			union
 			{
 				struct
@@ -52,10 +62,18 @@
 
 				uint8_t IntVal;
 			} Byte3;
-		} DS1307_TimeRegs_t;
 
-		typedef struct
-		{
+			union
+			{
+				struct
+				{
+					unsigned int DayOfWeek       : 3;
+					unsigned int Reserved        : 5;
+				} Fields;
+
+				uint8_t IntVal;
+			} Byte4;
+		
 			union
 			{
 				struct
@@ -66,7 +84,7 @@
 				} Fields;
 
 				uint8_t IntVal;
-			} Byte1;
+			} Byte5;
 
 			union
 			{
@@ -78,7 +96,7 @@
 				} Fields;
 
 				uint8_t IntVal;
-			} Byte2;
+			} Byte6;
 
 			union
 			{
@@ -89,29 +107,15 @@
 				} Fields;
 
 				uint8_t IntVal;
-			} Byte3;
-		} DS1307_DateRegs_t;
+			} Byte7;
+		} DS1307_DateTimeRegs_t;
 
 	/* Macros: */
-		#define DS1307_TIMEREG_START  0x00
-		#define DS1307_DATEREG_START  0x04
-
-		#define DS1307_ADDRESS_READ   0b11010001
-		#define DS1307_ADDRESS_WRITE  0b11010000
+		#define DS1307_ADDRESS       0xD0
 
 	/* Function Prototypes: */
-		void DS1307_SetDate(const uint8_t Day,
-		                    const uint8_t Month,
-		                    const uint8_t Year);
-		void DS1307_SetTime(const uint8_t Hour,
-		                    const uint8_t Minute,
-		                    const uint8_t Second);
-		void DS1307_GetDate(uint8_t* const Day,
-		                    uint8_t* const Month,
-		                    uint8_t* const Year);
-		void DS1307_GetTime(uint8_t* const Hour,
-		                    uint8_t* const Minute,
-		                    uint8_t* const Second);
+		bool DS1307_SetTimeDate(const TimeDate_t* NewTimeDate);
+		bool DS1307_GetTimeDate(TimeDate_t* const TimeDate);
 
 #endif