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

Merge pull request #46 from NicoHood/patch-1

Browse Source 
Update Arduino Uno board definitions (thanks to NicoHood).
This commit is contained in:
Dean Camera 2015-10-03 22:12:56 +10:00
commit 8f33ba8237
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LUFA/Drivers/Board/AVR8/UNO/Board.h
View File

@ -66,6 +66,12 @@
/* Macros: */ /* Macros: */
/** Indicates the board has hardware LEDs mounted. */ /** Indicates the board has hardware LEDs mounted. */
#define BOARD_HAS_LEDS #define BOARD_HAS_LEDS
/** Pin that can reset the main MCU. */
#define AVR_RESET_LINE_PORT PORTD
#define AVR_RESET_LINE_DDR DDRD
#define AVR_RESET_LINE_PIN PIND
#define AVR_RESET_LINE_MASK (1 << PD7)
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

16
LUFA/Drivers/Board/AVR8/UNO/LEDs.h
View File

@ -44,8 +44,8 @@
* *
* <table> * <table>
* <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr> * <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_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.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: */ /* Public Interface - May be used in end-application: */
/* Macros: */ /* Macros: */
/** LED mask for the first LED on the board. */ /** 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. */ /** LED mask for all the LEDs on the board. */
#define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2) #define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2)
/** LED mask for none of the board LEDs. */ /** LED mask for none of the board LEDs. */
#define LEDS_NO_LEDS 0 #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: */ /* Inline Functions: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
@ -92,7 +98,7 @@
static inline void LEDs_Disable(void) static inline void LEDs_Disable(void)
{ {
DDRD &= ~LEDS_ALL_LEDS; 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)