Newer AS7 integration binary, with ASF detection fixes and newer image assets.

[pub/USBasp.git] / LUFA / Drivers / Board / AVR8 / UNO / LEDs.h

diff --git a/LUFA/Drivers/Board/AVR8/UNO/LEDs.h b/LUFA/Drivers/Board/AVR8/UNO/LEDs.h
index f96501d..7309b93 100644 (file)
--- a/LUFA/Drivers/Board/AVR8/UNO/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/UNO/LEDs.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2015.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2015  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -44,8 +44,8 @@
  *
  *  <table>
  *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
  *
  *  <table>
  *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>

- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>RX</td><td>Low</td><td>PORTD.4</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Yellow</td><td>TX</td><td>Low</td><td>PORTD.5</td></tr>
+ *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>RX</td><td>Low</td><td>PORTD.5</td></tr>
+ *    <tr><td>LEDS_LED2</td><td>Yellow</td><td>TX</td><td>Low</td><td>PORTD.4</td></tr>

  *  </table>
  *
  *  @{
  *  </table>
  *
  *  @{


@@ -70,16 +70,22 @@
        /* 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. */

-                       #define LEDS_LED1        (1 << 4)
+                       #define LEDS_LED1        (1 << 5)

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

-                       #define LEDS_LED2        (1 << 5)
+                       #define LEDS_LED2        (1 << 4)

 
                        /** LED mask for all the LEDs on the board. */
                        #define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
 
                        /** LED mask for none of the board LEDs. */
                        #define LEDS_NO_LEDS     0
 
                        /** LED mask for all the LEDs on the board. */
                        #define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
 
                        /** LED mask for none of the board LEDs. */
                        #define LEDS_NO_LEDS     0

+                       
+                       /** LED mask for the library LED driver, to indicate TX activity. */
+                       #define LEDMASK_TX       LEDS_LED1
+                       
+                       /** LED mask for the library LED driver, to indicate RX activity. */
+                       #define LEDMASK_RX       LEDS_LED2

 
                /* Inline Functions: */
                #if !defined(__DOXYGEN__)
 
                /* Inline Functions: */
                #if !defined(__DOXYGEN__)


@@ -92,7 +98,7 @@
                        static inline void LEDs_Disable(void)
                        {
                                DDRD  &= ~LEDS_ALL_LEDS;
                        static inline void LEDs_Disable(void)
                        {
                                DDRD  &= ~LEDS_ALL_LEDS;

-                               PORTD &= ~LEDS_ALL_LEDS;
+                               PORTD |= LEDS_ALL_LEDS;

                        }
 
                        static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
                        }
 
                        static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)