From bb85d083a7899890d0c14502078f6fa60a09d5df Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 28 Feb 2012 20:40:24 +0000 Subject: Fix warnings and errors found by the new cppcheck provided static code analysis. --- Projects/TempDataLogger/Lib/DS1307.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'Projects/TempDataLogger/Lib') diff --git a/Projects/TempDataLogger/Lib/DS1307.c b/Projects/TempDataLogger/Lib/DS1307.c index 459030f84..0fbd17b5a 100644 --- a/Projects/TempDataLogger/Lib/DS1307.c +++ b/Projects/TempDataLogger/Lib/DS1307.c @@ -9,10 +9,7 @@ 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; @@ -41,6 +38,7 @@ bool DS1307_SetTimeDate(const TimeDate_t* NewTimeDate) { return false; } +#endif return true; } @@ -55,10 +53,7 @@ bool DS1307_GetTimeDate(TimeDate_t* const TimeDate) TimeDate->Day = 1; TimeDate->Month = 1; TimeDate->Year = 1; - - return true; -#endif - +#else DS1307_DateTimeRegs_t CurrentRegValues; const uint8_t ReadAddress = 0; @@ -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; +#endif return true; } -- cgit v1.2.3