From 071fd8ce536522ca6365580d64cd465e4c18a031 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 24 Feb 2010 06:58:23 +0000 Subject: Revert changes made for the partial port to the AVR32 architecture. --- LUFA/Drivers/Board/Temperature.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'LUFA/Drivers/Board/Temperature.c') diff --git a/LUFA/Drivers/Board/Temperature.c b/LUFA/Drivers/Board/Temperature.c index 09d705085..ea12bf766 100644 --- a/LUFA/Drivers/Board/Temperature.c +++ b/LUFA/Drivers/Board/Temperature.c @@ -47,25 +47,14 @@ int8_t Temperature_GetTemperature(void) { uint16_t Temp_ADC = ADC_GetChannelReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | TEMP_ADC_CHANNEL_MASK); - #if defined(__AVR32__) - if (Temp_ADC > Temperature_Lookup[0]) - return TEMP_MIN_TEMP; - - for (uint16_t Index = 0; Index < TEMP_TABLE_SIZE; Index++) - { - if (Temp_ADC > Temperature_Lookup[Index]) - return (Index + TEMP_TABLE_OFFSET); - } - #elif defined(__AVR__) if (Temp_ADC > pgm_read_word(&Temperature_Lookup[0])) - return TEMP_MIN_TEMP; + return TEMP_MIN_TEMP; for (uint16_t Index = 0; Index < TEMP_TABLE_SIZE; Index++) { if (Temp_ADC > pgm_read_word(&Temperature_Lookup[Index])) return (Index + TEMP_TABLE_OFFSET); } - #endif return TEMP_MAX_TEMP; } -- cgit v1.2.3