diff options
Diffstat (limited to 'LUFA/Drivers/Board')
-rw-r--r-- | LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h | 35 | ||||
-rw-r--r-- | LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h | 6 | ||||
-rw-r--r-- | LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h | 4 | ||||
-rw-r--r-- | LUFA/Drivers/Board/LEDs.h | 4 |
4 files changed, 40 insertions, 9 deletions
diff --git a/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h b/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h index 01818756f..c01675307 100644 --- a/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h @@ -29,7 +29,7 @@ */ /** \file - * \brief Board specific LED driver header for the PJRC Teensy boards. + * \brief Board specific LED driver header for the PJRC Teensy 1.x/2.x boards. * \copydetails Group_LEDs_TEENSY * * \note This file should not be included directly. It is automatically included as needed by the LEDs driver @@ -38,7 +38,9 @@ /** \ingroup Group_LEDs * \defgroup Group_LEDs_TEENSY TEENSY - * \brief Board specific LED driver header for the PJRC Teensy boards. + * \brief Board specific LED driver header for the PJRC Teensy 1.x/2.x boards. + * + * \note For version 2 Teensy boards, compile with <code>BOARD = TEENSY2</code>. * * Board specific LED driver header for the PJRC Teensy boards (http://www.pjrc.com/teensy/index.html). * @@ -77,28 +79,49 @@ static inline void LEDs_Init(void) { DDRD |= LEDS_ALL_LEDS; - PORTD |= LEDS_ALL_LEDS; + + #if (BOARD == BOARD_TEENSY2) + PORTD &= ~LEDS_ALL_LEDS; + #else + PORTD |= LEDS_ALL_LEDS; + #endif } static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) { + #if (BOARD == BOARD_TEENSY2) + PORTD |= LEDMask; + #else PORTD &= ~LEDMask; + #endif } static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) { - PORTD |= LEDMask; + #if (BOARD == BOARD_TEENSY2) + PORTD &= ~LEDMask; + #else + PORTD |= LEDMask; + #endif } static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) { + #if (BOARD == BOARD_TEENSY2) + PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask); + #else PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask); + #endif } static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) { + #if (BOARD == BOARD_TEENSY2) + PORTD = ((PORTD & ~LEDMask) | ActiveMask); + #else PORTD = ((PORTD | LEDMask) & ~ActiveMask); + #endif } static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) @@ -109,7 +132,11 @@ static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) { + #if (BOARD == BOARD_TEENSY2) + return (PORTD & LEDS_ALL_LEDS); + #else return (~PORTD & LEDS_ALL_LEDS); + #endif } #endif diff --git a/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h b/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h index 71ff72b15..8b65e6238 100644 --- a/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h +++ b/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h @@ -29,7 +29,7 @@ */ /** \file - * \brief Board specific Dataflash driver header for the Atmel XPLAIN. + * \brief Board specific Dataflash driver header for the original Atmel XPLAIN. * \copydetails Group_Dataflash_XPLAIN * * \note This file should not be included directly. It is automatically included as needed by the dataflash driver @@ -38,7 +38,9 @@ /** \ingroup Group_Dataflash * \defgroup Group_Dataflash_XPLAIN XPLAIN - * \brief Board specific Dataflash driver header for the Atmel XPLAIN. + * \brief Board specific Dataflash driver header for the original Atmel XPLAIN. + * + * \note For the first revision XPLAIN board, compile with <code>BOARD = BOARD_XPLAIN_REV1</code>. * * Board specific Dataflash driver header for the Atmel XPLAIN. * diff --git a/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h b/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h index d00bbb6a9..0eb11d978 100644 --- a/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h @@ -29,7 +29,7 @@ */ /** \file - * \brief Board specific LED driver header for the Atmel XPLAIN. + * \brief Board specific LED driver header for the original Atmel XPLAIN. * \copydetails Group_LEDs_XPLAIN * * \note This file should not be included directly. It is automatically included as needed by the LEDs driver @@ -38,7 +38,7 @@ /** \ingroup Group_LEDs * \defgroup Group_LEDs_XPLAIN XPLAIN - * \brief Board specific LED driver header for the Atmel XPLAIN. + * \brief Board specific LED driver header for the original Atmel XPLAIN. * * Board specific LED driver header for the Atmel XPLAIN. * diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h index 5ac361a72..eec9991eb 100644 --- a/LUFA/Drivers/Board/LEDs.h +++ b/LUFA/Drivers/Board/LEDs.h @@ -172,7 +172,9 @@ #elif (BOARD == BOARD_EVK1104) #include "UC3/EVK1104/LEDs.h" #elif (BOARD == BOARD_A3BU_XPLAINED) - #include "XMEGA/A3BU_XPLAINED/LEDs.h" + #include "XMEGA/A3BU_XPLAINED/LEDs.h" + #elif (BOARD == BOARD_TEENSY2) + #include "AVR8/TEENSY/LEDs.h" #else #include "Board/LEDs.h" #endif |