forked from mfulz_github/qmk_firmware
Added support for the Arduino Leonardo board. Swap Olimex 32U4 RX/TX LED masks so that it lines up with the Arduino boards.
This commit is contained in:
Dean Camera
parent
ffbb30e0f8
commit
f0e5425208
|
|
@ -71,4 +71,5 @@ BOARD_DUCE = AVR8 : atmega32u2 :
|
|||
BOARD_OLIMEX32U4 = AVR8 : atmega32u4 :
|
||||
BOARD_OLIMEXT32U4 = AVR8 : atmega32u4 :
|
||||
BOARD_OLIMEXISPMK2 = AVR8 : at90usb162 :
|
||||
BOARD_LEONARDO = AVR8 : atmega32u4 :
|
||||
#
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -216,6 +216,8 @@
|
|||
/** Selects the Olimex AVR-ISP-MK2 specific board drivers, including the Button and LED drivers. */
|
||||
#define BOARD_OLIMEXISPMK2 50
|
||||
|
||||
/** Selects the Arduino Leonardo specific board drivers, including the driver for the board LEDs. */
|
||||
#define BOARD_LEONARDO 51
|
||||
|
||||
#if !defined(__DOXYGEN__)
|
||||
#define BOARD_ BOARD_NONE
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* \section Sec_ChangeLogXXXXXX Version XXXXXX
|
||||
* <b>New:</b>
|
||||
* - Core:
|
||||
* - <i>None</i>
|
||||
* - Added support for the Arduino Leonardo board
|
||||
* - Library Applications:
|
||||
* - <i>None</i>
|
||||
*
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@
|
|||
* Currently supported third-party boards (see \ref Group_BoardTypes for makefile \c BOARD constant names):
|
||||
* - Adafruit U4 Breakout Board
|
||||
* - Arduino Uno
|
||||
* - Arduino Leonardo
|
||||
* - Bitwizard Multio and Big-Multio
|
||||
* - Busware BUI
|
||||
* - Busware CUL V3
|
||||
|
|
@ -115,9 +116,7 @@
|
|||
* - Micropendous Boards (Micropendous-32U2, Micropendous-1, Micropendous-2)
|
||||
* - Microsin AVR-USB162
|
||||
* - Minimus USB
|
||||
* - Olimex AVR-USB-162
|
||||
* - Olimex AVR-USB-32U4
|
||||
* - Olimex AVR-USB-T32U4
|
||||
* - Olimex AVR-USB-162, AVR-USB-32U4 and AVR-USB-T32U4 Boards
|
||||
* - Olimex AVR-ISP-MK2
|
||||
* - Paranoid Studio's US2AX (V1, V2 and V3 hardware revisions)
|
||||
* - PJRC Teensy (1.x and 2.x versions)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,169 @@
|
|||
/*
|
||||
LUFA Library
|
||||
Copyright (C) Dean Camera, 2012.
|
||||
|
||||
dean [at] fourwalledcubicle [dot] com
|
||||
www.lufa-lib.org
|
||||
*/
|
||||
|
||||
/*
|
||||
Copyright 2012 Dean Camera (dean [at] fourwalledcubicle [dot] com)
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this
|
||||
software and its documentation for any purpose is hereby granted
|
||||
without fee, provided that the above copyright notice appear in
|
||||
all copies and that both that the copyright notice and this
|
||||
permission notice and warranty disclaimer appear in supporting
|
||||
documentation, and that the name of the author not be used in
|
||||
advertising or publicity pertaining to distribution of the
|
||||
software without specific, written prior permission.
|
||||
|
||||
The author disclaim all warranties with regard to this
|
||||
software, including all implied warranties of merchantability
|
||||
and fitness. In no event shall the author be liable for any
|
||||
special, indirect or consequential damages or any damages
|
||||
whatsoever resulting from loss of use, data or profits, whether
|
||||
in an action of contract, negligence or other tortious action,
|
||||
arising out of or in connection with the use or performance of
|
||||
this software.
|
||||
*/
|
||||
|
||||
/** \file
|
||||
* \brief Board specific LED driver header for the Arduino Leondardo board.
|
||||
* \copydetails Group_LEDs_LEONDARDO
|
||||
*
|
||||
* \note This file should not be included directly. It is automatically included as needed by the LEDs driver
|
||||
* dispatch header located in LUFA/Drivers/Board/LEDs.h.
|
||||
*/
|
||||
|
||||
/** \ingroup Group_LEDs
|
||||
* \defgroup Group_LEDs_LEONDARDO LEONDARDO
|
||||
* \brief Board specific LED driver header for the Arduino Leondardo board.
|
||||
*
|
||||
* Board specific LED driver header for the Arduino Leondardo board (http://arduino.cc/en/Main/arduinoBoardLeonardo).
|
||||
*
|
||||
* <table>
|
||||
* <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>PORTB.0</td></tr>
|
||||
* <tr><td>LEDS_LED2</td><td>Yellow</td><td>TX</td><td>Low</td><td>PORTD.5</td></tr>
|
||||
* <tr><td>LEDS_LED1</td><td>Yellow</td><td>General Indicator</td><td>High</td><td>PORTC.7</td></tr>
|
||||
* </table>
|
||||
*
|
||||
* @{
|
||||
*/
|
||||
|
||||
#ifndef __LEDS_LEONDARDO_H__
|
||||
#define __LEDS_LEONDARDO_H__
|
||||
|
||||
/* Includes: */
|
||||
#include "../../../../Common/Common.h"
|
||||
|
||||
/* Enable C linkage for C++ Compilers: */
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Preprocessor Checks: */
|
||||
#if !defined(__INCLUDE_FROM_LEDS_H)
|
||||
#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
|
||||
#endif
|
||||
|
||||
/* Private Interface - For use in library only: */
|
||||
#if !defined(__DOXYGEN__)
|
||||
/* Macros: */
|
||||
#define LEDS_PORTB_LEDS (LEDS_LED1)
|
||||
#define LEDS_PORTD_LEDS (LEDS_LED2)
|
||||
#define LEDS_PORTE_LEDS (LEDS_LED3)
|
||||
#endif
|
||||
|
||||
/* Public Interface - May be used in end-application: */
|
||||
/* Macros: */
|
||||
/** LED mask for the first LED on the board. */
|
||||
#define LEDS_LED1 (1 << 5)
|
||||
|
||||
/** LED mask for the second LED on the board. */
|
||||
#define LEDS_LED2 (1 << 0)
|
||||
|
||||
/** LED mask for the third LED on the board. */
|
||||
#define LEDS_LED3 (1 << 6)
|
||||
|
||||
/** LED mask for all the LEDs on the board. */
|
||||
#define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
|
||||
|
||||
/** LED mask for none of the board LEDs. */
|
||||
#define LEDS_NO_LEDS 0
|
||||
|
||||
/* Inline Functions: */
|
||||
#if !defined(__DOXYGEN__)
|
||||
static inline void LEDs_Init(void)
|
||||
{
|
||||
DDRB |= LEDS_PORTB_LEDS;
|
||||
PORTB &= ~LEDS_PORTB_LEDS;
|
||||
DDRD |= LEDS_PORTD_LEDS;
|
||||
PORTD &= ~LEDS_PORTD_LEDS;
|
||||
DDRE |= LEDS_PORTE_LEDS;
|
||||
PORTE &= ~LEDS_PORTE_LEDS;
|
||||
}
|
||||
|
||||
static inline void LEDs_Disable(void)
|
||||
{
|
||||
DDRB &= ~LEDS_PORTB_LEDS;
|
||||
PORTB &= ~LEDS_PORTB_LEDS;
|
||||
DDRD &= ~LEDS_PORTD_LEDS;
|
||||
PORTD &= ~LEDS_PORTD_LEDS;
|
||||
DDRE &= ~LEDS_PORTE_LEDS;
|
||||
PORTE &= ~LEDS_PORTE_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);
|
||||
}
|
||||
|
||||
static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
|
||||
{
|
||||
PORTB &= ~(LEDMask & LEDS_PORTB_LEDS);
|
||||
PORTD &= ~(LEDMask & LEDS_PORTD_LEDS);
|
||||
PORTE &= ~(LEDMask & LEDS_PORTE_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));
|
||||
}
|
||||
|
||||
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));
|
||||
}
|
||||
|
||||
static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
|
||||
{
|
||||
PINB = (LEDMask & LEDS_PORTB_LEDS);
|
||||
PIND = (LEDMask & LEDS_PORTD_LEDS);
|
||||
PINE = (LEDMask & LEDS_PORTE_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));
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Disable C linkage for C++ Compilers: */
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
/** @} */
|
||||
|
||||
|
|
@ -44,8 +44,8 @@
|
|||
*
|
||||
* <table>
|
||||
* <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>Green</td><td>TX</td><td>High</td><td>PORTD.5</td></tr>
|
||||
* <tr><td>LEDS_LED2</td><td>Yellow</td><td>RX</td><td>High</td><td>PORTB.0</td></tr>
|
||||
* <tr><td>LEDS_LED1</td><td>Yellow</td><td>RX</td><td>High</td><td>PORTB.0</td></tr>
|
||||
* <tr><td>LEDS_LED2</td><td>Green</td><td>TX</td><td>High</td><td>PORTD.5</td></tr>
|
||||
* <tr><td>LEDS_LED3</td><td>N/A</td><td>General Indicator (Not Mounted)</td><td>High</td><td>PORTE.6</td></tr>
|
||||
* </table>
|
||||
*
|
||||
|
|
@ -71,8 +71,8 @@
|
|||
/* Private Interface - For use in library only: */
|
||||
#if !defined(__DOXYGEN__)
|
||||
/* Macros: */
|
||||
#define LEDS_PORTB_LEDS (LEDS_LED2)
|
||||
#define LEDS_PORTD_LEDS (LEDS_LED1)
|
||||
#define LEDS_PORTB_LEDS (LEDS_LED1)
|
||||
#define LEDS_PORTD_LEDS (LEDS_LED2)
|
||||
#define LEDS_PORTE_LEDS (LEDS_LED3)
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -193,6 +193,8 @@
|
|||
#include "AVR8/OLIMEXT32U4/LEDs.h"
|
||||
#elif (BOARD == BOARD_OLIMEXISPMK2)
|
||||
#include "AVR8/OLIMEXISPMK2/LEDs.h"
|
||||
#elif (BOARD == BOARD_LEONDARDO)
|
||||
#include "AVR8/LEONARDO/LEDs.h"
|
||||
#else
|
||||
#include "Board/LEDs.h"
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue