Fixed swapped LED3 and LED4 masks for the Olimex-32U4 development board LED driver.

diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 463b8cd..b9b464d 100644 (file)
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -32,7 +32,7 @@
   *  - Core:
   *   - Fixed incorrectly issuing STALL response to unsupported control request SETUP packets, rather than in the data/status stage
   *   - Fixed inverted LEDs_GetLEDs() function implementation for the Benito, Minimus and Arduino UNO boards
   *  - Core:
   *   - Fixed incorrectly issuing STALL response to unsupported control request SETUP packets, rather than in the data/status stage
   *   - Fixed inverted LEDs_GetLEDs() function implementation for the Benito, Minimus and Arduino UNO boards

-  *   - Fixed missing Win-32bit compatibility sections in the LUFA INF driver files (thanks to Christan Beharrell)
+  *   - Fixed missing Windows 32-bit compatibility sections in the LUFA INF driver files (thanks to Christan Beharrell)

   *   - Fixed logic hole breaking USB operations on a USB controller with only one supported USB mode and no USB_DEVICE_ONLY or USB_HOST_ONLY
   *     configuration token set
   *   - Fixed possible rounding in the VERSION_BCD() macros for some 0.01 step increments (thanks to Oliver Zander)
   *   - Fixed logic hole breaking USB operations on a USB controller with only one supported USB mode and no USB_DEVICE_ONLY or USB_HOST_ONLY
   *     configuration token set
   *   - Fixed possible rounding in the VERSION_BCD() macros for some 0.01 step increments (thanks to Oliver Zander)


@@ -44,6 +44,7 @@
   *   - Fixed incorrect Minimus board LED definitions (thanks to Joonas Lahtinen)
   *   - Fixed incorrect ordering of the linker options in the build system causing link failures in some cases
   *   - Fixed bug in the TWI peripheral driver for the AVR8 devices causing incorrect failure codes to be returned in some cases (thanks to Peter K)
   *   - Fixed incorrect Minimus board LED definitions (thanks to Joonas Lahtinen)
   *   - Fixed incorrect ordering of the linker options in the build system causing link failures in some cases
   *   - Fixed bug in the TWI peripheral driver for the AVR8 devices causing incorrect failure codes to be returned in some cases (thanks to Peter K)

+  *   - Fixed swapped LED3 and LED4 masks for the Olimex-32U4 development board LED driver

   *  - Library Applications:
   *   - Fixed broken RESET_TOGGLES_LIBUSB_COMPAT compile time option in the AVRISP-MKII project
   *   - Fixed incompatibility in the CDC class bootloader on some systems (thanks to Sylvain Munaut)
   *  - Library Applications:
   *   - Fixed broken RESET_TOGGLES_LIBUSB_COMPAT compile time option in the AVRISP-MKII project
   *   - Fixed incompatibility in the CDC class bootloader on some systems (thanks to Sylvain Munaut)

diff --git a/LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h b/LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h
index 574b65a..c6f2442 100644 (file)
--- a/LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h
@@ -78,7 +78,7 @@
 
                        #define LEDS_PORTD_MASK_SHIFT 1
        #endif
 
                        #define LEDS_PORTD_MASK_SHIFT 1
        #endif

-       
+

        /* Public Interface - May be used in end-application: */
                /* Macros: */
                        /** LED mask for the first LED on the board. */
        /* Public Interface - May be used in end-application: */
                /* Macros: */
                        /** LED mask for the first LED on the board. */


@@ -86,13 +86,13 @@
 
                        /** LED mask for the second LED on the board. */
                        #define LEDS_LED2        (1 << 0)
 
                        /** LED mask for the second LED on the board. */
                        #define LEDS_LED2        (1 << 0)

-                       
+

                        /** LED mask for the third LED on the board. */
                        /** LED mask for the third LED on the board. */

-                       #define LEDS_LED3        (1 << 5)
+                       #define LEDS_LED3        (1 << 6)

 
                        /** LED mask for the fourth LED on the board. */
 
                        /** LED mask for the fourth LED on the board. */

-                       #define LEDS_LED4        (1 << 6)
-                       
+                       #define LEDS_LED4        (1 << 5)
+

                        /** LED mask for all the LEDs on the board. */
                        #define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
 
                        /** LED mask for all the LEDs on the board. */
                        #define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
 


@@ -162,7 +162,7 @@
                        static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
                        static inline uint8_t LEDs_GetLEDs(void)
                        {
                        static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
                        static inline uint8_t LEDs_GetLEDs(void)
                        {

-                               return ((PORTB & LEDS_PORTB_LEDS) | 
+                               return ((PORTB & LEDS_PORTB_LEDS) |

                                        ((PORTD & (LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT)) >> LEDS_PORTD_MASK_SHIFT) |
                                        (PORTE & LEDS_PORTE_LEDS));
                        }
                                        ((PORTD & (LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT)) >> LEDS_PORTD_MASK_SHIFT) |
                                        (PORTE & LEDS_PORTE_LEDS));
                        }