X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/cd39c38d5f39d89da989859afd72576b4c1532aa..f555ad7ced743a19eb1eefaf5eaf536fcbe58d80:/Projects/TempDataLogger/Lib/DS1307.h

diff --git a/Projects/TempDataLogger/Lib/DS1307.h b/Projects/TempDataLogger/Lib/DS1307.h
index c9fe43c3d..6cc65ada6 100644
--- a/Projects/TempDataLogger/Lib/DS1307.h
+++ b/Projects/TempDataLogger/Lib/DS1307.h
@@ -1,8 +1,8 @@
 /*
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 #ifndef _DS1307_H_
@@ -24,10 +24,10 @@
 					unsigned int TenSec         : 3;
 					unsigned int CH             : 1;
 				} Fields;
-				
+
 				uint8_t IntVal;
 			} Byte1;
-			
+
 			union
 			{
 				struct
@@ -36,10 +36,10 @@
 					unsigned int TenMin         : 3;
 					unsigned int Reserved       : 1;
 				} Fields;
-				
+
 				uint8_t IntVal;
 			} Byte2;
-			
+
 			union
 			{
 				struct
@@ -49,7 +49,7 @@
 					unsigned int TwelveHourMode  : 1;
 					unsigned int Reserved        : 1;
 				} Fields;
-				
+
 				uint8_t IntVal;
 			} Byte3;
 		} DS1307_TimeRegs_t;
@@ -64,7 +64,7 @@
 					unsigned int TenDay          : 2;
 					unsigned int Reserved        : 2;
 				} Fields;
-			
+
 				uint8_t IntVal;
 			} Byte1;
 
@@ -76,10 +76,10 @@
 					unsigned int TenMonth        : 1;
 					unsigned int Reserved        : 3;
 				} Fields;
-				
+
 				uint8_t IntVal;
 			} Byte2;
-			
+
 			union
 			{
 				struct
@@ -87,7 +87,7 @@
 					unsigned int Year            : 4;
 					unsigned int TenYear         : 4;
 				} Fields;
-				
+
 				uint8_t IntVal;
 			} Byte3;
 		} DS1307_DateRegs_t;
@@ -95,9 +95,9 @@
 	/* Macros: */
 		#define DS1307_TIMEREG_START  0x00
 		#define DS1307_DATEREG_START  0x04
-	
-		#define DS1307_ADDRESS_READ   0b11010001
-		#define DS1307_ADDRESS_WRITE  0b11010000
+
+		#define DS1307_ADDRESS_READ   (0xD0 | TWI_ADDRESS_READ)
+		#define DS1307_ADDRESS_WRITE  (0xD0 | TWI_ADDRESS_WRITE)
 
 	/* Function Prototypes: */
 		void DS1307_SetDate(const uint8_t Day,
@@ -114,3 +114,4 @@
 		                    uint8_t* const Second);
 
 #endif
+