From c0c982df7af34ea0375eda774185f3825c261522 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 24 Feb 2010 09:49:19 +0000 Subject: Added a timeout value to the TWI_StartTransmission() function, within which the addressed device must respond. Fixed TWI_StartTransmission() corrupting the contents of the GPIOR0 register. --- Projects/TemperatureDataLogger/Lib/DS1307.c | 12 ++++++------ Projects/TemperatureDataLogger/makefile | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Projects') diff --git a/Projects/TemperatureDataLogger/Lib/DS1307.c b/Projects/TemperatureDataLogger/Lib/DS1307.c index 64e03df0d..0c1d98f00 100644 --- a/Projects/TemperatureDataLogger/Lib/DS1307.c +++ b/Projects/TemperatureDataLogger/Lib/DS1307.c @@ -21,7 +21,7 @@ void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year) CurrentRTCDate.Byte3.TenYear = (Year / 10); CurrentRTCDate.Byte3.Year = (Year % 10); - if (TWI_StartTransmission(DS1307_ADDRESS_WRITE)) + if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10)) { TWI_SendByte(DS1307_DATEREG_START); TWI_SendByte(CurrentRTCDate.Byte1.IntVal); @@ -48,7 +48,7 @@ void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second) CurrentRTCTime.Byte3.Hour = (Hour % 10); CurrentRTCTime.Byte3.TwelveHourMode = false; - if (TWI_StartTransmission(DS1307_ADDRESS_WRITE)) + if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10)) { TWI_SendByte(DS1307_TIMEREG_START); TWI_SendByte(CurrentRTCTime.Byte1.IntVal); @@ -68,7 +68,7 @@ void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year) return; #endif - if (TWI_StartTransmission(DS1307_ADDRESS_WRITE)) + if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10)) { TWI_SendByte(DS1307_DATEREG_START); @@ -77,7 +77,7 @@ void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year) DS1307_DateRegs_t CurrentRTCDate; - if (TWI_StartTransmission(DS1307_ADDRESS_READ)) + if (TWI_StartTransmission(DS1307_ADDRESS_READ, 10)) { TWI_ReceiveByte(&CurrentRTCDate.Byte1.IntVal, false); TWI_ReceiveByte(&CurrentRTCDate.Byte2.IntVal, false); @@ -100,7 +100,7 @@ void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second) return; #endif - if (TWI_StartTransmission(DS1307_ADDRESS_WRITE)) + if (TWI_StartTransmission(DS1307_ADDRESS_WRITE, 10)) { TWI_SendByte(DS1307_TIMEREG_START); @@ -109,7 +109,7 @@ void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second) DS1307_TimeRegs_t CurrentRTCTime; - if (TWI_StartTransmission(DS1307_ADDRESS_READ)) + if (TWI_StartTransmission(DS1307_ADDRESS_READ, 10)) { TWI_ReceiveByte(&CurrentRTCTime.Byte1.IntVal, false); TWI_ReceiveByte(&CurrentRTCTime.Byte2.IntVal, false); diff --git a/Projects/TemperatureDataLogger/makefile b/Projects/TemperatureDataLogger/makefile index 8fd2c2941..f48e155b0 100644 --- a/Projects/TemperatureDataLogger/makefile +++ b/Projects/TemperatureDataLogger/makefile @@ -193,7 +193,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) -CDEFS += -DDUMMY_RTC +#CDEFS += -DDUMMY_RTC # Place -D or -U options here for ASM sources -- cgit v1.2.3