From 42ac34b484b677ae1004c3d0215b27911a100a71 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 18 Jul 2010 07:31:57 +0000 Subject: Change over all makefiles to use C99 standards mode, rather than C99 + GNU Extensions. --- Projects/TempDataLogger/Lib/DS1307.c | 40 ++++++++++++++++++------------------ Projects/TempDataLogger/Lib/DS1307.h | 12 +++++------ Projects/TempDataLogger/makefile | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'Projects/TempDataLogger') diff --git a/Projects/TempDataLogger/Lib/DS1307.c b/Projects/TempDataLogger/Lib/DS1307.c index 8aa6ad0ef..003160fe2 100644 --- a/Projects/TempDataLogger/Lib/DS1307.c +++ b/Projects/TempDataLogger/Lib/DS1307.c @@ -14,12 +14,12 @@ void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year) #endif DS1307_DateRegs_t CurrentRTCDate; - CurrentRTCDate.Byte1.TenDay = (Day / 10); - CurrentRTCDate.Byte1.Day = (Day % 10); - CurrentRTCDate.Byte2.TenMonth = (Month / 10); - CurrentRTCDate.Byte2.Month = (Month % 10); - CurrentRTCDate.Byte3.TenYear = (Year / 10); - CurrentRTCDate.Byte3.Year = (Year % 10); + 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); if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10)) { @@ -39,14 +39,14 @@ void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second) #endif DS1307_TimeRegs_t CurrentRTCTime; - CurrentRTCTime.Byte1.TenSec = (Second / 10); - CurrentRTCTime.Byte1.Sec = (Second % 10); - CurrentRTCTime.Byte1.CH = false; - CurrentRTCTime.Byte2.TenMin = (Minute / 10); - CurrentRTCTime.Byte2.Min = (Minute % 10); - CurrentRTCTime.Byte3.TenHour = (Hour / 10); - CurrentRTCTime.Byte3.Hour = (Hour % 10); - CurrentRTCTime.Byte3.TwelveHourMode = false; + 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)) { @@ -86,9 +86,9 @@ void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year) TWI_StopTransmission(); } - *Day = (CurrentRTCDate.Byte1.TenDay * 10) + CurrentRTCDate.Byte1.Day; - *Month = (CurrentRTCDate.Byte2.TenMonth * 10) + CurrentRTCDate.Byte2.Month; - *Year = (CurrentRTCDate.Byte3.TenYear * 10) + CurrentRTCDate.Byte3.Year; + *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; } void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second) @@ -118,7 +118,7 @@ void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second) TWI_StopTransmission(); } - *Second = (CurrentRTCTime.Byte1.TenSec * 10) + CurrentRTCTime.Byte1.Sec; - *Minute = (CurrentRTCTime.Byte2.TenMin * 10) + CurrentRTCTime.Byte2.Min; - *Hour = (CurrentRTCTime.Byte3.TenHour * 10) + CurrentRTCTime.Byte3.Hour; + *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; } diff --git a/Projects/TempDataLogger/Lib/DS1307.h b/Projects/TempDataLogger/Lib/DS1307.h index 9b14ee467..58eac8e5c 100644 --- a/Projects/TempDataLogger/Lib/DS1307.h +++ b/Projects/TempDataLogger/Lib/DS1307.h @@ -23,7 +23,7 @@ unsigned int Sec : 4; unsigned int TenSec : 3; unsigned int CH : 1; - }; + } Fields; uint8_t IntVal; } Byte1; @@ -35,7 +35,7 @@ unsigned int Min : 4; unsigned int TenMin : 3; unsigned int _RESERVED : 1; - }; + } Fields; uint8_t IntVal; } Byte2; @@ -48,7 +48,7 @@ unsigned int TenHour : 2; unsigned int TwelveHourMode : 1; unsigned int _RESERVED : 1; - }; + } Fields; uint8_t IntVal; } Byte3; @@ -63,7 +63,7 @@ unsigned int Day : 4; unsigned int TenDay : 2; unsigned int _RESERVED : 2; - }; + } Fields; uint8_t IntVal; } Byte1; @@ -75,7 +75,7 @@ unsigned int Month : 4; unsigned int TenMonth : 1; unsigned int _RESERVED : 3; - }; + } Fields; uint8_t IntVal; } Byte2; @@ -86,7 +86,7 @@ { unsigned int Year : 4; unsigned int TenYear : 4; - }; + } Fields; uint8_t IntVal; } Byte3; diff --git a/Projects/TempDataLogger/makefile b/Projects/TempDataLogger/makefile index 65e483aff..89e851648 100644 --- a/Projects/TempDataLogger/makefile +++ b/Projects/TempDataLogger/makefile @@ -189,7 +189,7 @@ EXTRAINCDIRS = $(LUFA_PATH)/ # gnu89 = c89 plus GCC extensions # c99 = ISO C99 standard (not yet fully implemented) # gnu99 = c99 plus GCC extensions -CSTANDARD = -std=gnu99 +CSTANDARD = -std=c99 # Place -D or -U options here for C sources -- cgit v1.2.3