Fixed incorrect PID value being used in the USBtoSerial project (thanks to Phill).

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

diff --git a/LUFA/Drivers/Board/Temperature.h b/LUFA/Drivers/Board/Temperature.h
index 17b8acf..db2643c 100644 (file)
--- a/LUFA/Drivers/Board/Temperature.h
+++ b/LUFA/Drivers/Board/Temperature.h
@@ -33,6 +33,19 @@
  *  Temperature sensor board driver for the USB boards which contain a temperature sensor.\r
  */\r
 \r
  *  Temperature sensor board 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
+ *\r
+ *  \section Sec_Dependencies Module Source Dependencies\r
+ *  The following files must be built with any user project that uses this module:\r
+ *    - LUFA/Drivers/Board/Temperature.c\r
+ *\r
+ *  \section Module Description\r
+ *  Functions, macros, variables, enums and types related to the control of board temperature sensors.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __TEMPERATURE_H__\r
 #define __TEMPERATURE_H__\r
 \r
 #ifndef __TEMPERATURE_H__\r
 #define __TEMPERATURE_H__\r
 \r


@@ -44,11 +57,11 @@
        /* Includes: */\r
                #include <avr/pgmspace.h>\r
 \r
        /* Includes: */\r
                #include <avr/pgmspace.h>\r
 \r

-               #include "../AT90USBXXX/ADC.h"\r

                #include "../../Common/Common.h"\r
                #include "../../Common/Common.h"\r

+               #include "../Peripheral/ADC.h"\r

        \r
                #if !defined(BOARD)\r
        \r
                #if !defined(BOARD)\r

-                       #error #error BOARD must be set in makefile to a value specified in BoardTypes.h.       \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)\r
                        #error The selected board does not contain a temperature sensor.\r
                #endif\r
                #elif (BOARD != BOARD_USBKEY) && (BOARD != BOARD_STK525) && (BOARD != BOARD_STK526)\r
                        #error The selected board does not contain a temperature sensor.\r
                #endif\r


@@ -63,23 +76,28 @@
                        /** ADC channel number for the temperature sensor. */\r
                        #define TEMP_ADC_CHANNEL   0\r
                        \r
                        /** ADC channel number for the temperature sensor. */\r
                        #define TEMP_ADC_CHANNEL   0\r
                        \r

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

                        #define TEMP_MIN_TEMP      TEMP_TABLE_OFFSET\r
 \r
                        #define TEMP_MIN_TEMP      TEMP_TABLE_OFFSET\r
 \r

-                       /** Maximum returnable temperature from the Temperature_GetTemperature() function. */\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
-                       /** 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
-                        */\r
-                       #define Temperature_Init() ADC_SetupChannel(TEMP_ADC_CHANNEL);\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
+                                */\r
+                               static inline void Temperature_Init(void);\r
+                       #else\r
+                               #define Temperature_Init() ADC_SetupChannel(TEMP_ADC_CHANNEL);\r
+                       #endif\r

 \r
                /* Function Prototypes: */\r
                        /** Performs a complete ADC on the temperature sensor channel, and converts the result into a\r
 \r
                /* Function Prototypes: */\r
                        /** Performs a complete ADC on the temperature sensor channel, and converts the result into a\r

-                        *  valid temperature between TEMP_MIN_TEMP and TEMP_MAX_TEMP in degrees Celsius.\r
+                        *  valid temperature between \ref TEMP_MIN_TEMP and \ref TEMP_MAX_TEMP in degrees Celsius.\r

                         *\r
                         *  \return Signed temperature in degrees Celsius\r
                         */\r
                         *\r
                         *  \return Signed temperature in degrees Celsius\r
                         */\r


@@ -98,3 +116,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r