gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 12:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix typos in the XMEGA board LED drivers, use a cleaner change and set implementation.

Browse Source
This commit is contained in:
Dean Camera 2013-06-12 18:43:06 +02:00
parent 1eae43da0c
commit 6d58628e85
4 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LUFA/DoxygenPages/LUFAPoweredProjects.txt
View File

@ -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, "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 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 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 * \li Elektor Magazine, "Taming the Beast (2)" by Clemens Valens/Raymond Vermeulen, January 2013 Issue
* *
* \section Sec_LUFANotableMentions Other Notable Mentions of LUFA * \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 Adafruit "Ask an Engineer", 7th November 2010
* \li Arduino 2010 Keynote speech * \li Arduino 2010 Keynote speech

17
LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h
View File

@ -140,14 +140,21 @@
static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
{ {
PORTR_OUT = ((PORTR.OUT & ~LEDS_PORTR_LEDS) | (LEDMask & LEDS_PORTR_LEDS)); PORTR_OUTCLR = LEDS_PORTR_LEDS;
PORTD_OUT = ((PORTD.OUT & ~LEDS_PORTD_LEDS) | (LEDMask & LEDS_PORTD_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); PORTR_OUTCLR = (LEDMask & LEDS_PORTR_LEDS);
PORTD_OUT = (PORTD.OUT & ~(LEDMask & LEDS_PORTD_LEDS)) | (Active & LEDS_PORTD_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) static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)

7
LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h
View File

@ -120,7 +120,7 @@
{ {
PORTB.DIRCLR = LEDS_PORTB_LEDS; PORTB.DIRCLR = LEDS_PORTB_LEDS;
PORTB.OUTCLR = LEDS_PORTB_LEDS; PORTB.OUTCLR = LEDS_PORTB_LEDS;
PORTCFG.MPCMASK = 0; PORTCFG.MPCMASK = 0;
PORTB.PIN0CTRL = LEDS_PORTB_LEDS; PORTB.PIN0CTRL = LEDS_PORTB_LEDS;
@ -149,11 +149,12 @@
PORTE_OUTSET = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT); 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); PORTB_OUTCLR = (LEDMask & LEDS_PORTB_LEDS);
PORTE_OUTCLR = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT); PORTE_OUTCLR = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
PORTB_OUTSET = (ActiveMask & LEDS_PORTB_LEDS); PORTB_OUTSET = (ActiveMask & LEDS_PORTB_LEDS);
PORTE_OUTSET = ((ActiveMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT); PORTE_OUTSET = ((ActiveMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
} }

17
LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h
View File

@ -140,14 +140,21 @@
static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
{ {
PORTR_OUT = ((PORTR.OUT & ~LEDS_PORTR_LEDS) | (LEDMask & LEDS_PORTR_LEDS)); PORTR_OUTCLR = LEDS_PORTR_LEDS;
PORTD_OUT = ((PORTD.OUT & ~LEDS_PORTD_LEDS) | (LEDMask & LEDS_PORTD_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); PORTR_OUTCLR = (LEDMask & LEDS_PORTR_LEDS);
PORTD_OUT = (PORTD.OUT & ~(LEDMask & LEDS_PORTD_LEDS)) | (Active & LEDS_PORTD_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) static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)