Fixed ADC routines not correctly returning the last result when multiple channels...

Fixed ADC routines failing to read the extended channels (Channels 8 to 13, Internal Temperature Sensor) on the U4 series USB AVR parts.

diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
index 8b1b47d..4b120ae 100644 (file)
--- a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
+++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
@@ -116,36 +116,36 @@
                        \r
                        //@{\r
                        /** MUX mask define for the ADC0 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL0                    0x00\r
+                       #define  ADC_CHANNEL0                    (0x00 << MUX0)\r
 \r
                        /** MUX mask define for the ADC1 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL1                    0x01\r
+                       #define  ADC_CHANNEL1                    (0x01 << MUX0)\r
 \r
                        #if !(defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))\r
                                /** MUX mask define for the ADC2 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
                                 *\r
                                 *  \note Note available on all AVR models.\r
                                 */\r
-                               #define  ADC_CHANNEL2                    0x02\r
+                               #define  ADC_CHANNEL2                (0x02 << MUX0)\r
 \r
                                /** MUX mask define for the ADC3 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
                                 *\r
                                 *  \note Note available on all AVR models.\r
                                 */\r
-                               #define  ADC_CHANNEL3                    0x03\r
+                               #define  ADC_CHANNEL3                (0x03 << MUX0)\r
                        #endif\r
 \r
                        /** MUX mask define for the ADC4 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL4                    0x04\r
+                       #define  ADC_CHANNEL4                    (0x04 << MUX0)\r
 \r
                        /** MUX mask define for the ADC5 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL5                    0x05\r
+                       #define  ADC_CHANNEL5                    (0x05 << MUX0)\r
 \r
                        /** MUX mask define for the ADC6 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL6                    0x06\r
+                       #define  ADC_CHANNEL6                    (0x06 << MUX0)\r
 \r
                        /** MUX mask define for the ADC7 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
-                       #define  ADC_CHANNEL7                    0x07\r
+                       #define  ADC_CHANNEL7                    (0x07 << MUX0)\r
 \r
                        /** MUX mask define for the internal 1.1V bandgap channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */\r
                        #define  ADC_1100MV_BANDGAP              0x1E\r
@@ -155,44 +155,44 @@
                                 *\r
                                 *  \note Note available on all AVR models.\r
                                 */\r
-                               #define  ADC_CHANNEL8                0x20\r
+                               #define  ADC_CHANNEL8                ((1 << 8) | (0x00 << MUX0))\r
 \r
                                /** MUX mask define for the ADC9 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
                                 *\r
                                 *  \note Note available on all AVR models.\r
                                 */\r
-                               #define  ADC_CHANNEL9                0x21\r
+                               #define  ADC_CHANNEL9                ((1 << 8) | (0x01 << MUX0))\r
 \r
                                /** MUX mask define for the ADC10 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
                                 *\r
                                 *  \note Note available on all AVR models.\r
                                 */\r
-                               #define  ADC_CHANNEL10               0x22\r
+                               #define  ADC_CHANNEL10               ((1 << 8) | (0x02 << MUX0))\r
 \r
                                /** MUX mask define for the ADC11 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
                                 *\r
                                 *  \note Note available on all AVR models.\r
                                 */\r
-                               #define  ADC_CHANNEL11               0x23\r
+                               #define  ADC_CHANNEL11               ((1 << 8) | (0x03 << MUX0))\r
 \r
                                /** MUX mask define for the ADC12 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
                                 *\r
                                 *  \note Note available on all AVR models.\r
                                 */\r
-                               #define  ADC_CHANNEL12               0x24\r
+                               #define  ADC_CHANNEL12               ((1 << 8) | (0x04 << MUX0))\r
 \r
                                /** MUX mask define for the ADC13 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.\r
                                 *\r
                                 *  \note Note available on all AVR models.\r
                                 */\r
-                               #define  ADC_CHANNEL13               0x25\r
+                               #define  ADC_CHANNEL13               ((1 << 8) | (0x05 << MUX0))\r
 \r
                                /** MUX mask define for the internal temperature sensor channel of the ADC. See \ref ADC_StartReading and\r
                                 *  \ref ADC_GetChannelReading.\r
                                 *\r
                                 *  \note Note available on all AVR models.\r
                                 */\r
-                               #define  ADC_INT_TEMP_SENS           0x27                       \r
+                               #define  ADC_INT_TEMP_SENS           ((1 << 8) | (0x07 << MUX0))\r
                        #endif\r
                        //@}\r
                \r
@@ -224,7 +224,8 @@
                                 */\r
                                static inline bool ADC_IsReadingComplete(void);\r
                                \r
-                               /** Retrieves the conversion value of the last completed ADC conversion.\r
+                               /** Retrieves the conversion value of the last completed ADC conversion and clears the reading\r
+                                *  completion flag.\r
                                 *\r
                                 *  \return The result of the last ADC conversion\r
                                 */\r
@@ -236,9 +237,9 @@
                                \r
                                #define  ADC_GetStatus()               ((ADCSRA & (1 << ADEN)) ? true : false)\r
 \r
-                               #define  ADC_IsReadingComplete()        (ADCSRA & (1 << ADSC))\r
+                               #define  ADC_IsReadingComplete()       ((ADCSRA & (1 << ADIF)) ? true : false)\r
                                \r
-                               #define  ADC_GetResult()                 ADC                    \r
+                               #define  ADC_GetResult()                (ADCSRA |= (1 << ADIF), ADC)\r
                        #endif\r
                        \r
                /* Inline Functions: */\r
@@ -290,9 +291,16 @@
                         *\r
                         *  \param[in] MUXMask  Mask comprising of an ADC channel mask, reference mask and adjustment mask\r
                         */\r
-                       static inline void ADC_StartReading(const uint8_t MUXMask)\r
+                       static inline void ADC_StartReading(const uint16_t MUXMask)\r
                        {\r
                                ADMUX = MUXMask;\r
+                               \r
+                               #if (defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))\r
+                               if (MUXMask & (1 << 8))\r
+                                 ADCSB |=  (1 << MUX5);\r
+                               else\r
+                                 ADCSB &= ~(1 << MUX5);\r
+                               #endif\r
                        \r
                                ADCSRA |= (1 << ADSC);\r
                        }\r
@@ -302,8 +310,8 @@
                         *\r
                         *  \param[in] MUXMask  Mask comprising of an ADC channel mask, reference mask and adjustment mask\r
                         */\r
-                       static inline uint16_t ADC_GetChannelReading(const uint8_t MUXMask) ATTR_WARN_UNUSED_RESULT;\r
-                       static inline uint16_t ADC_GetChannelReading(const uint8_t MUXMask)\r
+                       static inline uint16_t ADC_GetChannelReading(const uint16_t MUXMask) ATTR_WARN_UNUSED_RESULT;\r
+                       static inline uint16_t ADC_GetChannelReading(const uint16_t MUXMask)\r
                        {\r
                                ADC_StartReading(MUXMask);\r
        \r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index e32cdab..1eac9eb 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -22,7 +22,10 @@
   *  <b>Fixed:</b>\r
   *  - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin\r
   *  - Fixed TWI_StartTransmission() corrupting the contents of the GPIOR0 register\r
-  *  - Fix TWI driver not aborting when faced with no response after attempting to address a device on the bus\r
+  *  - Fixed TWI driver not aborting when faced with no response after attempting to address a device on the bus\r
+  *  - Fixed ADC routines not correctly returning the last result when multiple channels were read\r
+  *  - Fixed ADC routines failing to read the extended channels (Channels 8 to 13, Internal Temperature Sensor) on the\r
+  *    U4 series USB AVR parts\r
   *\r
   *  \section Sec_ChangeLog100219 Version 100219\r
   *\r