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 f4ecf71..7cfdb13 100644 (file)
--- a/LUFA/Drivers/Board/Temperature.h
+++ b/LUFA/Drivers/Board/Temperature.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -29,12 +29,13 @@
 */\r
 \r
 /** \file\r
+ *  \brief Master include file for the board temperature sensor driver.\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
- *  @defgroup Group_Temperature Temperature Driver - LUFA/Drivers/Board/Temperature.h\r
+ *  @defgroup Group_Temperature Temperature Sensor Driver - LUFA/Drivers/Board/Temperature.h\r
  *\r
  *  \section Sec_Dependencies Module Source Dependencies\r
  *  The following files must be built with any user project that uses this module:\r
@@ -52,20 +53,17 @@
 #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
-               #if !defined(BOARD)\r
-                       #error BOARD must be set in makefile to a value specified in BoardTypes.h.      \r
-               #elif (BOARD != BOARD_USBKEY) && (BOARD != BOARD_STK525) && (BOARD != BOARD_STK526) && (BOARD != BOARD_USER)\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
                        #error The selected board does not contain a temperature sensor.\r
                #endif\r
 \r
@@ -77,21 +75,24 @@
        /* 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
+                       /** 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
-                       #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
-                       #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
                                /** Initializes the temperature sensor driver, including setting up the appropriate ADC channel.\r
                                 *  This must be called before any other temperature sensor routines.\r
                                 *\r
-                                *  The ADC itself (not the ADC channel) must be configured separately before calling the temperature\r
-                                *  sensor functions.\r
+                                *  \note The ADC itself (not the ADC channel) must be configured separately before calling the\r
+                                *        temperature sensor functions.\r
                                 */\r
                                static inline void Temperature_Init(void);\r
                        #else\r