diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-08-12 17:25:39 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-08-12 17:25:39 +0000 |
| commit | 40755d4fde2e7b88341d91f61e6f053144c02986 (patch) | |
| tree | 4119e2ee3683e9b61f1c694f598f213708b265f2 /LUFA/Drivers/Board/AVR8/LEONARDO/LEDs.h | |
| parent | 6fb6c628fa63036fa1a2244eabf3880624b3ca0b (diff) | |
| download | lufa-40755d4fde2e7b88341d91f61e6f053144c02986.tar.gz lufa-40755d4fde2e7b88341d91f61e6f053144c02986.tar.bz2 lufa-40755d4fde2e7b88341d91f61e6f053144c02986.zip | |
Fixed inverted LED driving code for the Arduino Leonardo board. Fixed inverted LEDs_GetLEDs() function implementation for the Benito, Minimus and Arduino UNO boards.
Diffstat (limited to 'LUFA/Drivers/Board/AVR8/LEONARDO/LEDs.h')
| -rw-r--r-- | LUFA/Drivers/Board/AVR8/LEONARDO/LEDs.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/LUFA/Drivers/Board/AVR8/LEONARDO/LEDs.h b/LUFA/Drivers/Board/AVR8/LEONARDO/LEDs.h index 0a3c9fcb9..e8e9c4993 100644 --- a/LUFA/Drivers/Board/AVR8/LEONARDO/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/LEONARDO/LEDs.h @@ -73,7 +73,7 @@ /* Macros: */ #define LEDS_PORTB_LEDS (LEDS_LED1) #define LEDS_PORTD_LEDS (LEDS_LED2) - #define LEDS_PORTE_LEDS (LEDS_LED3) + #define LEDS_PORTC_LEDS (LEDS_LED3) #endif /* Public Interface - May be used in end-application: */ @@ -85,7 +85,7 @@ #define LEDS_LED2 (1 << 0) /** LED mask for the third LED on the board. */ - #define LEDS_LED3 (1 << 6) + #define LEDS_LED3 (1 << 7) /** LED mask for all the LEDs on the board. */ #define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2 | LEDS_LED3) @@ -98,11 +98,11 @@ static inline void LEDs_Init(void) { DDRB |= LEDS_PORTB_LEDS; - PORTB &= ~LEDS_PORTB_LEDS; + PORTB |= LEDS_PORTB_LEDS; DDRD |= LEDS_PORTD_LEDS; - PORTD &= ~LEDS_PORTD_LEDS; - DDRE |= LEDS_PORTE_LEDS; - PORTE &= ~LEDS_PORTE_LEDS; + PORTD |= LEDS_PORTD_LEDS; + DDRC |= LEDS_PORTC_LEDS; + PORTC &= ~LEDS_PORTC_LEDS; } static inline void LEDs_Disable(void) @@ -111,50 +111,50 @@ PORTB &= ~LEDS_PORTB_LEDS; DDRD &= ~LEDS_PORTD_LEDS; PORTD &= ~LEDS_PORTD_LEDS; - DDRE &= ~LEDS_PORTE_LEDS; - PORTE &= ~LEDS_PORTE_LEDS; + DDRC &= ~LEDS_PORTC_LEDS; + PORTC &= ~LEDS_PORTC_LEDS; } static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) { - PORTB |= (LEDMask & LEDS_PORTB_LEDS); - PORTD |= (LEDMask & LEDS_PORTD_LEDS); - PORTE |= (LEDMask & LEDS_PORTE_LEDS); + PORTB &= ~(LEDMask & LEDS_PORTB_LEDS); + PORTD &= ~(LEDMask & LEDS_PORTD_LEDS); + PORTC |= (LEDMask & LEDS_PORTC_LEDS); } static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) { - PORTB &= ~(LEDMask & LEDS_PORTB_LEDS); - PORTD &= ~(LEDMask & LEDS_PORTD_LEDS); - PORTE &= ~(LEDMask & LEDS_PORTE_LEDS); + PORTB |= (LEDMask & LEDS_PORTB_LEDS); + PORTD |= (LEDMask & LEDS_PORTD_LEDS); + PORTC &= ~(LEDMask & LEDS_PORTC_LEDS); } static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) { - PORTB = ((PORTB & ~LEDS_PORTB_LEDS) | (LEDMask & LEDS_PORTB_LEDS)); - PORTD = ((PORTD & ~LEDS_PORTD_LEDS) | (LEDMask & LEDS_PORTD_LEDS)); - PORTE = ((PORTE & ~LEDS_PORTE_LEDS) | (LEDMask & LEDS_PORTE_LEDS)); + PORTB = ((PORTB & ~LEDS_PORTB_LEDS) | (LEDMask & LEDS_PORTB_LEDS)); + PORTD = ((PORTD & ~LEDS_PORTD_LEDS) | (LEDMask & LEDS_PORTD_LEDS)); + PORTC = ((PORTC | LEDS_PORTC_LEDS) & ~(LEDMask & LEDS_PORTC_LEDS)); } static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) { - PORTB = ((PORTB & ~(LEDMask & LEDS_PORTB_LEDS)) | (ActiveMask & LEDS_PORTB_LEDS)); - PORTD = ((PORTD & ~(LEDMask & LEDS_PORTD_LEDS)) | (ActiveMask & LEDS_PORTD_LEDS)); - PORTE = ((PORTE & ~(LEDMask & LEDS_PORTE_LEDS)) | (ActiveMask & LEDS_PORTE_LEDS)); + PORTB = ((PORTB & ~(LEDMask & LEDS_PORTB_LEDS)) | (ActiveMask & LEDS_PORTB_LEDS)); + PORTD = ((PORTD & ~(LEDMask & LEDS_PORTD_LEDS)) | (ActiveMask & LEDS_PORTD_LEDS)); + PORTC = ((PORTC | (LEDMask & LEDS_PORTC_LEDS)) | ~(ActiveMask & LEDS_PORTC_LEDS)); } static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { PINB = (LEDMask & LEDS_PORTB_LEDS); PIND = (LEDMask & LEDS_PORTD_LEDS); - PINE = (LEDMask & LEDS_PORTE_LEDS); + PINC = (LEDMask & LEDS_PORTC_LEDS); } static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) { - return ((PORTB & LEDS_PORTB_LEDS) | (PORTD & LEDS_PORTD_LEDS) | (PORTE & LEDS_PORTE_LEDS)); + return ((PORTB & LEDS_PORTB_LEDS) | (PORTD & LEDS_PORTD_LEDS) | (~PORTC & LEDS_PORTC_LEDS)); } #endif |