Update Programmers Notepad project file to ensure it is current.

[pub/USBasp.git] / Projects / TempDataLogger / Lib / DS1307.c

diff --git a/Projects/TempDataLogger/Lib/DS1307.c b/Projects/TempDataLogger/Lib/DS1307.c
index 2f84a18..0a702a3 100644 (file)
--- a/Projects/TempDataLogger/Lib/DS1307.c
+++ b/Projects/TempDataLogger/Lib/DS1307.c
@@ -1,5 +1,5 @@
 /*
 /*

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2013.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org


@@ -9,10 +9,7 @@
 
 bool DS1307_SetTimeDate(const TimeDate_t* NewTimeDate)
 {
 
 bool DS1307_SetTimeDate(const TimeDate_t* NewTimeDate)
 {

-#if defined(DUMMY_RTC)
-       return true;
-#endif
-
+#if !defined(DUMMY_RTC)

        DS1307_DateTimeRegs_t NewRegValues;
        const uint8_t         WriteAddress = 0;
 
        DS1307_DateTimeRegs_t NewRegValues;
        const uint8_t         WriteAddress = 0;
 


@@ -34,13 +31,14 @@ bool DS1307_SetTimeDate(const TimeDate_t* NewTimeDate)
        NewRegValues.Byte6.Fields.Month     = (NewTimeDate->Month % 10);
        NewRegValues.Byte7.Fields.TenYear   = (NewTimeDate->Year / 10);
        NewRegValues.Byte7.Fields.Year      = (NewTimeDate->Year % 10);
        NewRegValues.Byte6.Fields.Month     = (NewTimeDate->Month % 10);
        NewRegValues.Byte7.Fields.TenYear   = (NewTimeDate->Year / 10);
        NewRegValues.Byte7.Fields.Year      = (NewTimeDate->Year % 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)
        {
                return false;
        }
        // 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)
        {
                return false;
        }

+#endif

 
        return true;
 }
 
        return true;
 }


@@ -51,24 +49,21 @@ bool DS1307_GetTimeDate(TimeDate_t* const TimeDate)
        TimeDate->Hour   = 1;
        TimeDate->Minute = 1;
        TimeDate->Second = 1;
        TimeDate->Hour   = 1;
        TimeDate->Minute = 1;
        TimeDate->Second = 1;

-       
+

        TimeDate->Day    = 1;
        TimeDate->Month  = 1;
        TimeDate->Year   = 1;
        TimeDate->Day    = 1;
        TimeDate->Month  = 1;
        TimeDate->Year   = 1;

-       
-       return true;
-#endif
-
+#else

        DS1307_DateTimeRegs_t CurrentRegValues;
        const uint8_t         ReadAddress = 0;
        DS1307_DateTimeRegs_t CurrentRegValues;
        const uint8_t         ReadAddress = 0;

-       
+

        // 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)
        {
                return false;
        }
        // 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)
        {
                return false;
        }

-       
+

        // 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;
        // 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;


@@ -78,6 +73,7 @@ bool DS1307_GetTimeDate(TimeDate_t* const TimeDate)
        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;
        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;

+#endif

 
        return true;
 }
 
        return true;
 }