diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-06-12 18:43:06 +0200 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-06-12 18:43:06 +0200 |
| commit | 6d58628e85f473001cbacc012d7f25b477c3e797 (patch) | |
| tree | d72a2ad44b3efe8124756a00cb0860ae7888aa8a /LUFA | |
| parent | 1eae43da0c1959496f721c07e00b0f111cf39035 (diff) | |
| download | lufa-6d58628e85f473001cbacc012d7f25b477c3e797.tar.gz lufa-6d58628e85f473001cbacc012d7f25b477c3e797.tar.bz2 lufa-6d58628e85f473001cbacc012d7f25b477c3e797.zip | |
Fix typos in the XMEGA board LED drivers, use a cleaner change and set implementation.
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/DoxygenPages/LUFAPoweredProjects.txt | 3 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h | 17 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h | 7 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h | 17 |
4 files changed, 30 insertions, 14 deletions
diff --git a/LUFA/DoxygenPages/LUFAPoweredProjects.txt b/LUFA/DoxygenPages/LUFAPoweredProjects.txt index e689bc91d..e8ff40b63 100644 --- a/LUFA/DoxygenPages/LUFAPoweredProjects.txt +++ b/LUFA/DoxygenPages/LUFAPoweredProjects.txt @@ -192,10 +192,11 @@ * \li Elektor Magazine, "USB is Cool/Sucks" by Jerry Jacobs and Chris Vossen (minor mention), January 2010 Issue * \li Elektor Magazine, "20 x Open Source" by Jens Nickel, March 2010 Issue * \li Circuit Cellar Magazine, "Advanced USB Design Debugging" by Collin O'Flynn, August 2010 Issue + * \li "Some Assembly Required: Assembly Language Programming with the AVR Microcontroller" by Timothy S. Margush * \li Elektor Magazine, "Taming the Beast (2)" by Clemens Valens/Raymond Vermeulen, January 2013 Issue * * \section Sec_LUFANotableMentions Other Notable Mentions of LUFA - * The following are non-magazine but notable mentions of the LUFA library. + * The following are non-print but notable mentions of the LUFA library. * * \li Adafruit "Ask an Engineer", 7th November 2010 * \li Arduino 2010 Keynote speech diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h index 8487daa45..925bd2669 100644 --- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h +++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h @@ -140,14 +140,21 @@ static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) { - PORTR_OUT = ((PORTR.OUT & ~LEDS_PORTR_LEDS) | (LEDMask & LEDS_PORTR_LEDS)); - PORTD_OUT = ((PORTD.OUT & ~LEDS_PORTD_LEDS) | (LEDMask & LEDS_PORTD_LEDS)); + PORTR_OUTCLR = LEDS_PORTR_LEDS; + PORTD_OUTCLR = LEDS_PORTD_LEDS; + + PORTR_OUTSET = (LEDMask & LEDS_PORTR_LEDS); + PORTD_OUTSET = (LEDMask & LEDS_PORTD_LEDS); } - static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) + static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, + const uint8_t ActiveMask) { - PORTR_OUT = (PORTR.OUT & ~(LEDMask & LEDS_PORTR_LEDS)) | (Active & LEDS_PORTR_LEDS); - PORTD_OUT = (PORTD.OUT & ~(LEDMask & LEDS_PORTD_LEDS)) | (Active & LEDS_PORTD_LEDS); + PORTR_OUTCLR = (LEDMask & LEDS_PORTR_LEDS); + PORTD_OUTCLR = (LEDMask & LEDS_PORTD_LEDS); + + PORTR_OUTSET = (ActiveMask & LEDS_PORTR_LEDS); + PORTD_OUTSET = (ActiveMask & LEDS_PORTD_LEDS); } static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) diff --git a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h index caa5cd7a2..50ef7d86a 100644 --- a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h +++ b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h @@ -120,7 +120,7 @@ { PORTB.DIRCLR = LEDS_PORTB_LEDS; PORTB.OUTCLR = LEDS_PORTB_LEDS; - + PORTCFG.MPCMASK = 0; PORTB.PIN0CTRL = LEDS_PORTB_LEDS; @@ -149,11 +149,12 @@ PORTE_OUTSET = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT); } - static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) + static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, + const uint8_t ActiveMask) { PORTB_OUTCLR = (LEDMask & LEDS_PORTB_LEDS); PORTE_OUTCLR = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT); - + PORTB_OUTSET = (ActiveMask & LEDS_PORTB_LEDS); PORTE_OUTSET = ((ActiveMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT); } diff --git a/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h b/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h index d3488537d..348eedf15 100644 --- a/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h +++ b/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h @@ -140,14 +140,21 @@ static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) { - PORTR_OUT = ((PORTR.OUT & ~LEDS_PORTR_LEDS) | (LEDMask & LEDS_PORTR_LEDS)); - PORTD_OUT = ((PORTD.OUT & ~LEDS_PORTD_LEDS) | (LEDMask & LEDS_PORTD_LEDS)); + PORTR_OUTCLR = LEDS_PORTR_LEDS; + PORTD_OUTCLR = LEDS_PORTD_LEDS; + + PORTR_OUTSET = (LEDMask & LEDS_PORTR_LEDS); + PORTD_OUTSET = (LEDMask & LEDS_PORTD_LEDS); } - static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) + static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, + const uint8_t ActiveMask) { - PORTR_OUT = (PORTR.OUT & ~(LEDMask & LEDS_PORTR_LEDS)) | (Active & LEDS_PORTR_LEDS); - PORTD_OUT = (PORTD.OUT & ~(LEDMask & LEDS_PORTD_LEDS)) | (Active & LEDS_PORTD_LEDS); + PORTR_OUTCLR = (LEDMask & LEDS_PORTR_LEDS); + PORTD_OUTCLR = (LEDMask & LEDS_PORTD_LEDS); + + PORTR_OUTSET = (ActiveMask & LEDS_PORTR_LEDS); + PORTD_OUTSET = (ActiveMask & LEDS_PORTD_LEDS); } static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) |