Add start of a SDP service table, which will be linked to the Bluetooth SDP code.

[pub/USBasp.git] / LUFA / Drivers / Board / Temperature.h

diff --git a/LUFA/Drivers/Board/Temperature.h b/LUFA/Drivers/Board/Temperature.h
index f7f0034..7cfdb13 100644 (file)
--- a/LUFA/Drivers/Board/Temperature.h
+++ b/LUFA/Drivers/Board/Temperature.h
@@ -29,8 +29,9 @@
 */\r
 \r
 /** \file\r
 */\r
 \r
 /** \file\r

+ *  \brief Master include file for the board temperature sensor driver.\r

  *\r
  *\r

- *  Temperature sensor board driver for the USB boards which contain a temperature sensor.\r
+ *  Master include file for the board temperature sensor driver, for the USB boards which contain a temperature sensor.\r

  */\r
 \r
 /** \ingroup Group_BoardDrivers\r
  */\r
 \r
 /** \ingroup Group_BoardDrivers\r


@@ -52,19 +53,14 @@
 #ifndef __TEMPERATURE_H__\r
 #define __TEMPERATURE_H__\r
 \r
 #ifndef __TEMPERATURE_H__\r
 #define __TEMPERATURE_H__\r
 \r

-       /* Macros: */\r
-       #if !defined(__DOXYGEN__)\r
-               #define INCLUDE_FROM_BOARD_DRIVER\r
-       #endif\r
-       \r

        /* Includes: */\r
                #include <avr/pgmspace.h>\r
 \r
                #include "../../Common/Common.h"\r
                #include "../Peripheral/ADC.h"\r
        \r
        /* Includes: */\r
                #include <avr/pgmspace.h>\r
 \r
                #include "../../Common/Common.h"\r
                #include "../Peripheral/ADC.h"\r
        \r

-               #if !defined(BOARD)\r
-                       #error BOARD must be set in makefile to a value specified in BoardTypes.h.      \r
+               #if (BOARD == BOARD_NONE)\r
+                       #error The Board Temperature Sensor driver cannot be used if the makefile BOARD option is not set.\r

                #elif ((BOARD != BOARD_USBKEY) && (BOARD != BOARD_STK525) && \\r
                       (BOARD != BOARD_STK526) && (BOARD != BOARD_USER) &&   \\r
                           (BOARD != BOARD_EVK527))\r
                #elif ((BOARD != BOARD_USBKEY) && (BOARD != BOARD_STK525) && \\r
                       (BOARD != BOARD_STK526) && (BOARD != BOARD_USER) &&   \\r
                           (BOARD != BOARD_EVK527))\r


@@ -79,13 +75,16 @@
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** ADC channel number for the temperature sensor. */\r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** ADC channel number for the temperature sensor. */\r

-                       #define TEMP_ADC_CHANNEL   0\r
+                       #define TEMP_ADC_CHANNEL       0\r

                        \r
                        \r

+                       /** ADC channel MUX mask for the temperature sensor. */\r
+                       #define TEMP_ADC_CHANNEL_MASK  ADC_CHANNEL0\r
+\r

                        /** Minimum returnable temperature from the \ref Temperature_GetTemperature() function. */\r
                        /** Minimum returnable temperature from the \ref Temperature_GetTemperature() function. */\r

-                       #define TEMP_MIN_TEMP      TEMP_TABLE_OFFSET\r
+                       #define TEMP_MIN_TEMP          TEMP_TABLE_OFFSET\r

 \r
                        /** Maximum returnable temperature from the \ref Temperature_GetTemperature() function. */\r
 \r
                        /** Maximum returnable temperature from the \ref Temperature_GetTemperature() function. */\r

-                       #define TEMP_MAX_TEMP      ((TEMP_TABLE_SIZE - 1) + TEMP_TABLE_OFFSET)\r
+                       #define TEMP_MAX_TEMP          ((TEMP_TABLE_SIZE - 1) + TEMP_TABLE_OFFSET)\r

                \r
                /* Pseudo-Function Macros: */\r
                        #if defined(__DOXYGEN__)\r
                \r
                /* Pseudo-Function Macros: */\r
                        #if defined(__DOXYGEN__)\r