X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/42ac34b484b677ae1004c3d0215b27911a100a71..a9abe1fdea5ccf67aaccab6fdde300d6fcf2d15a:/Projects/TempDataLogger/Lib/DS1307.c?ds=inline

diff --git a/Projects/TempDataLogger/Lib/DS1307.c b/Projects/TempDataLogger/Lib/DS1307.c
index 003160fe2..459030f84 100644
--- a/Projects/TempDataLogger/Lib/DS1307.c
+++ b/Projects/TempDataLogger/Lib/DS1307.c
@@ -1,124 +1,84 @@
 /*
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2012.
+
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 #include "DS1307.h"
 
-void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year)
+bool DS1307_SetTimeDate(const TimeDate_t* NewTimeDate)
 {
 #if defined(DUMMY_RTC)
-	return;
+	return true;
 #endif
 
-	DS1307_DateRegs_t CurrentRTCDate;		
-	CurrentRTCDate.Byte1.Fields.TenDay   = (Day / 10);
-	CurrentRTCDate.Byte1.Fields.Day      = (Day % 10);
-	CurrentRTCDate.Byte2.Fields.TenMonth = (Month / 10);
-	CurrentRTCDate.Byte2.Fields.Month    = (Month % 10);
-	CurrentRTCDate.Byte3.Fields.TenYear  = (Year / 10);
-	CurrentRTCDate.Byte3.Fields.Year     = (Year % 10);
+	DS1307_DateTimeRegs_t NewRegValues;
+	const uint8_t         WriteAddress = 0;
 
-	if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10))
-	{
-		TWI_SendByte(DS1307_DATEREG_START);
-		TWI_SendByte(CurrentRTCDate.Byte1.IntVal);
-		TWI_SendByte(CurrentRTCDate.Byte2.IntVal);
-		TWI_SendByte(CurrentRTCDate.Byte3.IntVal);
-		
-		TWI_StopTransmission();
-	}
-}
+	// Convert new time data to the DS1307's time register layout
+	NewRegValues.Byte1.Fields.TenSec    = (NewTimeDate->Second / 10);
+	NewRegValues.Byte1.Fields.Sec       = (NewTimeDate->Second % 10);
+	NewRegValues.Byte1.Fields.CH        = false;
+	NewRegValues.Byte2.Fields.TenMin    = (NewTimeDate->Minute / 10);
+	NewRegValues.Byte2.Fields.Min       = (NewTimeDate->Minute % 10);
+	NewRegValues.Byte3.Fields.TenHour   = (NewTimeDate->Hour / 10);
+	NewRegValues.Byte3.Fields.Hour      = (NewTimeDate->Hour % 10);
+	NewRegValues.Byte3.Fields.TwelveHourMode = false;
 
-void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second)
-{
-#if defined(DUMMY_RTC)
-	return;
-#endif
+	// Convert new date data to the DS1307's date register layout
+	NewRegValues.Byte4.Fields.DayOfWeek = 0;
+	NewRegValues.Byte5.Fields.TenDay    = (NewTimeDate->Day / 10);
+	NewRegValues.Byte5.Fields.Day       = (NewTimeDate->Day % 10);
+	NewRegValues.Byte6.Fields.TenMonth  = (NewTimeDate->Month / 10);
+	NewRegValues.Byte6.Fields.Month     = (NewTimeDate->Month % 10);
+	NewRegValues.Byte7.Fields.TenYear   = (NewTimeDate->Year / 10);
+	NewRegValues.Byte7.Fields.Year      = (NewTimeDate->Year % 10);
 
-	DS1307_TimeRegs_t CurrentRTCTime;
-	CurrentRTCTime.Byte1.Fields.TenSec  = (Second / 10);
-	CurrentRTCTime.Byte1.Fields.Sec     = (Second % 10);
-	CurrentRTCTime.Byte1.Fields.CH      = false;
-	CurrentRTCTime.Byte2.Fields.TenMin  = (Minute / 10);
-	CurrentRTCTime.Byte2.Fields.Min     = (Minute % 10);
-	CurrentRTCTime.Byte3.Fields.TenHour = (Hour / 10);
-	CurrentRTCTime.Byte3.Fields.Hour    = (Hour % 10);
-	CurrentRTCTime.Byte3.Fields.TwelveHourMode = false;
-	
-	if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10))
+	// Write the new Time and Date into the DS1307
+	if (TWI_WritePacket(DS1307_ADDRESS, 10, &WriteAddress, sizeof(WriteAddress),
+	                   (uint8_t*)&NewRegValues, sizeof(DS1307_DateTimeRegs_t)) != TWI_ERROR_NoError)
 	{
-		TWI_SendByte(DS1307_TIMEREG_START);
-		TWI_SendByte(CurrentRTCTime.Byte1.IntVal);
-		TWI_SendByte(CurrentRTCTime.Byte2.IntVal);
-		TWI_SendByte(CurrentRTCTime.Byte3.IntVal);
-		
-		TWI_StopTransmission();
+		return false;
 	}
-}
-		
-void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year)
-{
-#if defined(DUMMY_RTC)
-	*Day   = 1;
-	*Month = 1;
-	*Year  = 1;
-	return;
-#endif
 
-	if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10))
-	{
-		TWI_SendByte(DS1307_DATEREG_START);
-		
-		TWI_StopTransmission();
-	}
-
-	DS1307_DateRegs_t CurrentRTCDate;
-
-	if (TWI_StartTransmission(DS1307_ADDRESS_READ, 10))
-	{
-		TWI_ReceiveByte(&CurrentRTCDate.Byte1.IntVal, false);
-		TWI_ReceiveByte(&CurrentRTCDate.Byte2.IntVal, false);
-		TWI_ReceiveByte(&CurrentRTCDate.Byte3.IntVal, true);
-		
-		TWI_StopTransmission();
-	}
-
-	*Day    = (CurrentRTCDate.Byte1.Fields.TenDay   * 10) + CurrentRTCDate.Byte1.Fields.Day;
-	*Month  = (CurrentRTCDate.Byte2.Fields.TenMonth * 10) + CurrentRTCDate.Byte2.Fields.Month;
-	*Year   = (CurrentRTCDate.Byte3.Fields.TenYear  * 10) + CurrentRTCDate.Byte3.Fields.Year;
+	return true;
 }
 
-void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second)
+bool DS1307_GetTimeDate(TimeDate_t* const TimeDate)
 {
 #if defined(DUMMY_RTC)
-	*Hour   = 1;
-	*Minute = 1;
-	*Second = 1;
-	return;
+	TimeDate->Hour   = 1;
+	TimeDate->Minute = 1;
+	TimeDate->Second = 1;
+
+	TimeDate->Day    = 1;
+	TimeDate->Month  = 1;
+	TimeDate->Year   = 1;
+
+	return true;
 #endif
 
-	if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10))
-	{
-		TWI_SendByte(DS1307_TIMEREG_START);
-		
-		TWI_StopTransmission();
-	}
-	
-	DS1307_TimeRegs_t CurrentRTCTime;
+	DS1307_DateTimeRegs_t CurrentRegValues;
+	const uint8_t         ReadAddress = 0;
 
-	if (TWI_StartTransmission(DS1307_ADDRESS_READ, 10))
+	// Read in the stored Time and Date from the DS1307
+	if (TWI_ReadPacket(DS1307_ADDRESS, 10, &ReadAddress, sizeof(ReadAddress),
+	                   (uint8_t*)&CurrentRegValues, sizeof(DS1307_DateTimeRegs_t)) != TWI_ERROR_NoError)
 	{
-		TWI_ReceiveByte(&CurrentRTCTime.Byte1.IntVal, false);
-		TWI_ReceiveByte(&CurrentRTCTime.Byte2.IntVal, false);
-		TWI_ReceiveByte(&CurrentRTCTime.Byte3.IntVal, true);
-		
-		TWI_StopTransmission();
+		return false;
 	}
 
-	*Second  = (CurrentRTCTime.Byte1.Fields.TenSec  * 10) + CurrentRTCTime.Byte1.Fields.Sec;
-	*Minute  = (CurrentRTCTime.Byte2.Fields.TenMin  * 10) + CurrentRTCTime.Byte2.Fields.Min;
-	*Hour    = (CurrentRTCTime.Byte3.Fields.TenHour * 10) + CurrentRTCTime.Byte3.Fields.Hour;
+	// Convert stored time value into decimal
+	TimeDate->Second  = (CurrentRegValues.Byte1.Fields.TenSec  * 10) + CurrentRegValues.Byte1.Fields.Sec;
+	TimeDate->Minute  = (CurrentRegValues.Byte2.Fields.TenMin  * 10) + CurrentRegValues.Byte2.Fields.Min;
+	TimeDate->Hour    = (CurrentRegValues.Byte3.Fields.TenHour * 10) + CurrentRegValues.Byte3.Fields.Hour;
+
+	// Convert stored date value into decimal
+	TimeDate->Day    = (CurrentRegValues.Byte5.Fields.TenDay   * 10) + CurrentRegValues.Byte5.Fields.Day;
+	TimeDate->Month  = (CurrentRegValues.Byte6.Fields.TenMonth * 10) + CurrentRegValues.Byte6.Fields.Month;
+	TimeDate->Year   = (CurrentRegValues.Byte7.Fields.TenYear  * 10) + CurrentRegValues.Byte7.Fields.Year;
+
+	return true;
 }
+