Altered all endpoint/pipe stream transfers so that the new BytesProcessed parameter...

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

diff --git a/Projects/TempDataLogger/Lib/DS1307.c b/Projects/TempDataLogger/Lib/DS1307.c
index 003160f..077f140 100644 (file)
--- a/Projects/TempDataLogger/Lib/DS1307.c
+++ b/Projects/TempDataLogger/Lib/DS1307.c
@@ -1,19 +1,21 @@
 /*
 /*

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

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 #include "DS1307.h"
 
 */
 
 #include "DS1307.h"
 

-void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year)
+void DS1307_SetDate(const uint8_t Day,
+                    const uint8_t Month,
+                    const uint8_t Year)

 {
 #if defined(DUMMY_RTC)
        return;
 #endif
 
 {
 #if defined(DUMMY_RTC)
        return;
 #endif
 

-       DS1307_DateRegs_t CurrentRTCDate;               
+       DS1307_DateRegs_t CurrentRTCDate;

        CurrentRTCDate.Byte1.Fields.TenDay   = (Day / 10);
        CurrentRTCDate.Byte1.Fields.Day      = (Day % 10);
        CurrentRTCDate.Byte2.Fields.TenMonth = (Month / 10);
        CurrentRTCDate.Byte1.Fields.TenDay   = (Day / 10);
        CurrentRTCDate.Byte1.Fields.Day      = (Day % 10);
        CurrentRTCDate.Byte2.Fields.TenMonth = (Month / 10);


@@ -27,12 +29,14 @@ void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year)
                TWI_SendByte(CurrentRTCDate.Byte1.IntVal);
                TWI_SendByte(CurrentRTCDate.Byte2.IntVal);
                TWI_SendByte(CurrentRTCDate.Byte3.IntVal);
                TWI_SendByte(CurrentRTCDate.Byte1.IntVal);
                TWI_SendByte(CurrentRTCDate.Byte2.IntVal);
                TWI_SendByte(CurrentRTCDate.Byte3.IntVal);

-               
+

                TWI_StopTransmission();
        }
 }
 
                TWI_StopTransmission();
        }
 }
 

-void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second)
+void DS1307_SetTime(const uint8_t Hour,
+                    const uint8_t Minute,
+                    const uint8_t Second)

 {
 #if defined(DUMMY_RTC)
        return;
 {
 #if defined(DUMMY_RTC)
        return;


@@ -47,19 +51,21 @@ void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second)
        CurrentRTCTime.Byte3.Fields.TenHour = (Hour / 10);
        CurrentRTCTime.Byte3.Fields.Hour    = (Hour % 10);
        CurrentRTCTime.Byte3.Fields.TwelveHourMode = false;
        CurrentRTCTime.Byte3.Fields.TenHour = (Hour / 10);
        CurrentRTCTime.Byte3.Fields.Hour    = (Hour % 10);
        CurrentRTCTime.Byte3.Fields.TwelveHourMode = false;

-       
+

        if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10))
        {
                TWI_SendByte(DS1307_TIMEREG_START);
                TWI_SendByte(CurrentRTCTime.Byte1.IntVal);
                TWI_SendByte(CurrentRTCTime.Byte2.IntVal);
                TWI_SendByte(CurrentRTCTime.Byte3.IntVal);
        if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10))
        {
                TWI_SendByte(DS1307_TIMEREG_START);
                TWI_SendByte(CurrentRTCTime.Byte1.IntVal);
                TWI_SendByte(CurrentRTCTime.Byte2.IntVal);
                TWI_SendByte(CurrentRTCTime.Byte3.IntVal);

-               
+

                TWI_StopTransmission();
        }
 }
                TWI_StopTransmission();
        }
 }

-               
-void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year)
+
+void DS1307_GetDate(uint8_t* const Day,
+                    uint8_t* const Month,
+                    uint8_t* const Year)

 {
 #if defined(DUMMY_RTC)
        *Day   = 1;
 {
 #if defined(DUMMY_RTC)
        *Day   = 1;


@@ -71,7 +77,7 @@ void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year)
        if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10))
        {
                TWI_SendByte(DS1307_DATEREG_START);
        if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10))
        {
                TWI_SendByte(DS1307_DATEREG_START);

-               
+

                TWI_StopTransmission();
        }
 
                TWI_StopTransmission();
        }
 


@@ -82,7 +88,7 @@ void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year)
                TWI_ReceiveByte(&CurrentRTCDate.Byte1.IntVal, false);
                TWI_ReceiveByte(&CurrentRTCDate.Byte2.IntVal, false);
                TWI_ReceiveByte(&CurrentRTCDate.Byte3.IntVal, true);
                TWI_ReceiveByte(&CurrentRTCDate.Byte1.IntVal, false);
                TWI_ReceiveByte(&CurrentRTCDate.Byte2.IntVal, false);
                TWI_ReceiveByte(&CurrentRTCDate.Byte3.IntVal, true);

-               
+

                TWI_StopTransmission();
        }
 
                TWI_StopTransmission();
        }
 


@@ -91,7 +97,9 @@ void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year)
        *Year   = (CurrentRTCDate.Byte3.Fields.TenYear  * 10) + CurrentRTCDate.Byte3.Fields.Year;
 }
 
        *Year   = (CurrentRTCDate.Byte3.Fields.TenYear  * 10) + CurrentRTCDate.Byte3.Fields.Year;
 }
 

-void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second)
+void DS1307_GetTime(uint8_t* const Hour,
+                    uint8_t* const Minute,
+                    uint8_t* const Second)

 {
 #if defined(DUMMY_RTC)
        *Hour   = 1;
 {
 #if defined(DUMMY_RTC)
        *Hour   = 1;


@@ -103,10 +111,10 @@ void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second)
        if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10))
        {
                TWI_SendByte(DS1307_TIMEREG_START);
        if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10))
        {
                TWI_SendByte(DS1307_TIMEREG_START);

-               
+

                TWI_StopTransmission();
        }
                TWI_StopTransmission();
        }

-       
+

        DS1307_TimeRegs_t CurrentRTCTime;
 
        if (TWI_StartTransmission(DS1307_ADDRESS_READ, 10))
        DS1307_TimeRegs_t CurrentRTCTime;
 
        if (TWI_StartTransmission(DS1307_ADDRESS_READ, 10))


@@ -114,7 +122,7 @@ void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second)
                TWI_ReceiveByte(&CurrentRTCTime.Byte1.IntVal, false);
                TWI_ReceiveByte(&CurrentRTCTime.Byte2.IntVal, false);
                TWI_ReceiveByte(&CurrentRTCTime.Byte3.IntVal, true);
                TWI_ReceiveByte(&CurrentRTCTime.Byte1.IntVal, false);
                TWI_ReceiveByte(&CurrentRTCTime.Byte2.IntVal, false);
                TWI_ReceiveByte(&CurrentRTCTime.Byte3.IntVal, true);

-               
+

                TWI_StopTransmission();
        }
 
                TWI_StopTransmission();
        }
 


@@ -122,3 +130,4 @@ void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second)
        *Minute  = (CurrentRTCTime.Byte2.Fields.TenMin  * 10) + CurrentRTCTime.Byte2.Fields.Min;
        *Hour    = (CurrentRTCTime.Byte3.Fields.TenHour * 10) + CurrentRTCTime.Byte3.Fields.Hour;
 }
        *Minute  = (CurrentRTCTime.Byte2.Fields.TenMin  * 10) + CurrentRTCTime.Byte2.Fields.Min;
        *Hour    = (CurrentRTCTime.Byte3.Fields.TenHour * 10) + CurrentRTCTime.Byte3.Fields.Hour;
 }

+