diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-09-13 08:21:07 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-09-13 08:21:07 +0000 |
| commit | 2b1f6dd63e3a9ae5ed2ab9d4aeabd60eab7c6c10 (patch) | |
| tree | 858ff1ca8b6781ea8f53ecc55881701602784991 /Projects/TempDataLogger/TempDataLogger.c | |
| parent | 44e3311de4c0d12b228bce55edc4ceff690d4f91 (diff) | |
Commit LUFA-111009-QA tag for QA testing before moving into beta phase.LUFA-111009-QA
git-svn-id: http://lufa-lib.googlecode.com/svn/tags/LUFA-111009-QA@1923 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Projects/TempDataLogger/TempDataLogger.c')
| -rw-r--r-- | Projects/TempDataLogger/TempDataLogger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Projects/TempDataLogger/TempDataLogger.c b/Projects/TempDataLogger/TempDataLogger.c index e0a08933..e8d79874 100644 --- a/Projects/TempDataLogger/TempDataLogger.c +++ b/Projects/TempDataLogger/TempDataLogger.c @@ -102,7 +102,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK) uint8_t LEDMask = LEDs_GetLEDs(); /* Check to see if the logging interval has expired */ - if (CurrentLoggingTicks++ < LoggingInterval500MS_SRAM) + if (++CurrentLoggingTicks < LoggingInterval500MS_SRAM) return; /* Reset log tick counter to prepare for next logging interval */ @@ -200,7 +200,7 @@ void SetupHardware(void) Temperature_Init(); Dataflash_Init(); USB_Init(); - TWI_Init(TWI_BIT_PRESCALE_4, (F_CPU / 4 / 50000) / 2); + TWI_Init(TWI_BIT_PRESCALE_4, TWI_BITLENGTH_FROM_FREQ(4, 50000)); /* 500ms logging interval timer configuration */ OCR1A = (((F_CPU / 1024) / 2) - 1); |