Fixed inverted LED logic in the USB2AX board LED driver (thanks to Nicolas Saugnier).

diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index df50476..fa7607d 100644 (file)
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -49,6 +49,7 @@
   *   - Fixed compile error if LEDs_Disable() is called and BOARD=NONE is set (thanks to Sam Lin)
   *   - Fixed inverted LED logic in the OLIMEX162 board LED driver
   *   - Fixed incorrect reponse to GET STATUS requests in device mode if NO_DEVICE_SELF_POWER or NO_DEVICE_REMOTE_WAKEUP tokens are defined (thanks to Georg Glock)
   *   - Fixed compile error if LEDs_Disable() is called and BOARD=NONE is set (thanks to Sam Lin)
   *   - Fixed inverted LED logic in the OLIMEX162 board LED driver
   *   - Fixed incorrect reponse to GET STATUS requests in device mode if NO_DEVICE_SELF_POWER or NO_DEVICE_REMOTE_WAKEUP tokens are defined (thanks to Georg Glock)

+  *   - Fixed inverted LED logic in the USB2AX board LED driver

   *  - Library Applications:
   *   - Fixed error in the AVRISP-MKII programmer when ISP mode is used at 64KHz (thanks to Ben R. Porter)
   *   - Fixed AVRISP-MKII programmer project failing to compile for the U4 chips when VTARGET_ADC_CHANNEL is defined to an invalid channel and NO_VTARGET_DETECT is
   *  - Library Applications:
   *   - Fixed error in the AVRISP-MKII programmer when ISP mode is used at 64KHz (thanks to Ben R. Porter)
   *   - Fixed AVRISP-MKII programmer project failing to compile for the U4 chips when VTARGET_ADC_CHANNEL is defined to an invalid channel and NO_VTARGET_DETECT is

diff --git a/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h b/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h
index cec18c4..e666987 100644 (file)
--- a/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h
@@ -54,13 +54,13 @@
  *  <b>USB2AX</b>:\r
  *  <table>\r
  *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>\r
  *  <b>USB2AX</b>:\r
  *  <table>\r
  *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>\r

- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTC.6</td></tr>\r
+ *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTC.6</td></tr>\r

  *  </table>\r
  *\r
  *  <b>USB2AX_V3</b>:\r
  *  <table>\r
  *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>\r
  *  </table>\r
  *\r
  *  <b>USB2AX_V3</b>:\r
  *  <table>\r
  *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>\r

- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTD.1</td></tr>\r
+ *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.1</td></tr>\r

  *  </table>\r
  *\r
  *  @{\r
  *  </table>\r
  *\r
  *  @{\r


@@ -108,11 +108,11 @@
                        static inline void LEDs_Init(void)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                        static inline void LEDs_Init(void)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               DDRC  |= LEDS_ALL_LEDS;\r
-                               PORTC |= LEDS_ALL_LEDS;                         \r
+                               DDRC  |=  LEDS_ALL_LEDS;\r
+                               PORTC &= ~LEDS_ALL_LEDS;                                \r

                                #else\r
                                #else\r

-                               DDRD  |= LEDS_ALL_LEDS;\r
-                               PORTD |= LEDS_ALL_LEDS;                         \r
+                               DDRD  |=  LEDS_ALL_LEDS;\r
+                               PORTD &= ~LEDS_ALL_LEDS;                                \r

                                #endif                          \r
                        }\r
 \r
                                #endif                          \r
                        }\r
 \r


@@ -130,27 +130,27 @@
                        static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                        static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               PORTC &= ~LEDMask;                              \r
+                               PORTC |= LEDMask;                               \r

                                #else\r
                                #else\r

-                               PORTD &= ~LEDMask;\r
+                               PORTD |= LEDMask;\r

                                #endif\r
                        }\r
 \r
                        static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                                #endif\r
                        }\r
 \r
                        static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               PORTC |= LEDMask;\r
+                               PORTC &= ~LEDMask;\r

                                #else\r
                                #else\r

-                               PORTD |= LEDMask;\r
+                               PORTD &= ~LEDMask;\r

                                #endif\r
                        }\r
 \r
                        static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                                #endif\r
                        }\r
 \r
                        static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               PORTC = ((PORTC | LEDS_ALL_LEDS) & ~LEDMask);                           \r
+                               PORTC = ((PORTC & ~LEDS_ALL_LEDS) | LEDMask);                           \r

                                #else\r
                                #else\r

-                               PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);\r
+                               PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);\r

                                #endif\r
                        }\r
 \r
                                #endif\r
                        }\r
 \r


@@ -158,9 +158,9 @@
                                                           const uint8_t ActiveMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                                                           const uint8_t ActiveMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               PORTC = ((PORTC | LEDMask) & ~ActiveMask);                              \r
+                               PORTC = ((PORTC & ~LEDMask) | ActiveMask);                              \r

                                #else\r
                                #else\r

-                               PORTD = ((PORTD | LEDMask) & ~ActiveMask);\r
+                               PORTD = ((PORTD & ~LEDMask) | ActiveMask);\r

                                #endif\r
                        }\r
 \r
                                #endif\r
                        }\r
 \r


@@ -177,9 +177,9 @@
                        static inline uint8_t LEDs_GetLEDs(void)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                        static inline uint8_t LEDs_GetLEDs(void)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               return (~PORTC & LEDS_ALL_LEDS);                                \r
+                               return (PORTC & LEDS_ALL_LEDS);                         \r

                                #else\r
                                #else\r

-                               return (~PORTD & LEDS_ALL_LEDS);\r
+                               return (PORTD & LEDS_ALL_LEDS);\r

                                #endif\r
                        }\r
                #endif\r
                                #endif\r
                        }\r
                #endif\r