Add LUFA-111009-BETA tag.

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

diff --git a/Projects/TempDataLogger/TempDataLogger.c b/Projects/TempDataLogger/TempDataLogger.c
index e0a0893..e8d7987 100644 (file)
--- 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 */
        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 */
          return;
 
        /* Reset log tick counter to prepare for next logging interval */


@@ -200,7 +200,7 @@ void SetupHardware(void)
        Temperature_Init();
        Dataflash_Init();
        USB_Init();
        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);
 
        /* 500ms logging interval timer configuration */
        OCR1A   = (((F_CPU / 1024) / 2) - 1);