Ensure Temperature.c and TWI_AVR8.c can be compiled silently in projects with non-supported hardware - produce errors only if the user application includes the module header files.

pull/1469/head
Dean Camera 13 years ago
parent d771099f62
commit 9add0d100d

@ -28,8 +28,11 @@
this software. this software.
*/ */
#define __INCLUDE_FROM_TEMPERATURE_C
#include "Temperature.h" #include "Temperature.h"
#if defined(TEMPERATURE_SENSOR_DRIVER_COMPATIBLE)
static const uint16_t PROGMEM Temperature_Lookup[TEMP_TABLE_SIZE] = static const uint16_t PROGMEM Temperature_Lookup[TEMP_TABLE_SIZE] =
{ {
0x3B4, 0x3B0, 0x3AB, 0x3A6, 0x3A0, 0x39A, 0x394, 0x38E, 0x388, 0x381, 0x37A, 0x373, 0x3B4, 0x3B0, 0x3AB, 0x3A6, 0x3A0, 0x39A, 0x394, 0x38E, 0x388, 0x381, 0x37A, 0x373,
@ -60,3 +63,4 @@ int8_t Temperature_GetTemperature(void)
return TEMP_MAX_TEMP; return TEMP_MAX_TEMP;
} }
#endif

@ -69,16 +69,22 @@
/* Includes: */ /* Includes: */
#include "../../Common/Common.h" #include "../../Common/Common.h"
#include "../Peripheral/ADC.h"
#if (BOARD == BOARD_NONE) /* Preprocessor Checks: */
#error The Board Temperature Sensor driver cannot be used if the makefile BOARD option is not set. #if ((BOARD == BOARD_USBKEY) || (BOARD == BOARD_STK525) || \
#elif ((BOARD != BOARD_USBKEY) && (BOARD != BOARD_STK525) && \ (BOARD == BOARD_STK526) || (BOARD == BOARD_EVK527))
(BOARD != BOARD_STK526) && (BOARD != BOARD_USER) && \ #define TEMPERATURE_SENSOR_DRIVER_COMPATIBLE
(BOARD != BOARD_EVK527)) #endif
#if !defined(__INCLUDE_FROM_TEMPERATURE_C) && !defined(TEMPERATURE_SENSOR_DRIVER_COMPATIBLE)
#error The selected board does not contain a compatible temperature sensor. #error The selected board does not contain a compatible temperature sensor.
#endif #endif
#if defined(TEMPERATURE_SENSOR_DRIVER_COMPATIBLE)
/* Includes: */
#include "../Peripheral/ADC.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@ -133,6 +139,8 @@
} }
#endif #endif
#endif
#endif #endif
/** @} */ /** @} */

@ -29,7 +29,7 @@
*/ */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8) && defined(TWCR)
#define __INCLUDE_FROM_TWI_C #define __INCLUDE_FROM_TWI_C
#include "../TWI.h" #include "../TWI.h"

Loading…
Cancel
Save