noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'led_fix' of https://github.com/NicoHood/Arduino

This commit is contained in:
Cristian Maglie 2015-11-24 16:36:50 +01:00
parent 1da7979984 38bae05f65
commit 4c2af08bb2
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/shared/lib/keywords.txt
View File

@ -28,6 +28,8 @@ INTERNAL LITERAL2 AnalogReference RESERVED_WORD_2
INTERNAL1V1 LITERAL2 AnalogReference RESERVED_WORD_2 INTERNAL1V1 LITERAL2 AnalogReference RESERVED_WORD_2
INTERNAL2V56 LITERAL2 AnalogReference RESERVED_WORD_2 INTERNAL2V56 LITERAL2 AnalogReference RESERVED_WORD_2
LED_BUILTIN LITERAL2 RESERVED_WORD_2 LED_BUILTIN LITERAL2 RESERVED_WORD_2
LED_BUILTIN_RX LITERAL2 RESERVED_WORD_2
LED_BUILTIN_TX LITERAL2 RESERVED_WORD_2
auto LITERAL2 RESERVED_WORD_2 auto LITERAL2 RESERVED_WORD_2
constexpr LITERAL2 RESERVED_WORD_2 constexpr LITERAL2 RESERVED_WORD_2

1
build/shared/revisions.txt
View File

@ -20,6 +20,7 @@ ARDUINO 1.6.7
parseFloat also support parsing floats without a leading 0, parseFloat also support parsing floats without a leading 0,
Stream::find(char) added to SAM. Thanks @Chris--A. Stream::find(char) added to SAM. Thanks @Chris--A.
* Leonardo/Micro (and other atmega32u4 based boards) now have SerialUSB alias for Serial * Leonardo/Micro (and other atmega32u4 based boards) now have SerialUSB alias for Serial
* Leonardo now has LED_BUILTIN_RX/TX definitions in variant file. Thanks @NicoHood
ARDUINO 1.6.6 - 2015.11.03 ARDUINO 1.6.6 - 2015.11.03

13
hardware/arduino/avr/variants/leonardo/pins_arduino.h
View File

@ -88,7 +88,7 @@
#undef OCR2_6 #undef OCR2_6
#undef OCR2_7 #undef OCR2_7
#define NUM_DIGITAL_PINS 30 #define NUM_DIGITAL_PINS 31
#define NUM_ANALOG_INPUTS 12 #define NUM_ANALOG_INPUTS 12
#define TX_RX_LED_INIT DDRD |= (1<<5), DDRB |= (1<<0) #define TX_RX_LED_INIT DDRD |= (1<<5), DDRB |= (1<<0)
@ -100,6 +100,8 @@
static const uint8_t SDA = 2; static const uint8_t SDA = 2;
static const uint8_t SCL = 3; static const uint8_t SCL = 3;
#define LED_BUILTIN 13 #define LED_BUILTIN 13
#define LED_BUILTIN_RX 17
#define LED_BUILTIN_TX 30
// Map SPI port to 'new' pins D14..D17 // Map SPI port to 'new' pins D14..D17
static const uint8_t SS = 17; static const uint8_t SS = 17;
@ -131,6 +133,8 @@ static const uint8_t A11 = 29; // D12
extern const uint8_t PROGMEM analog_pin_to_channel_PGM[]; extern const uint8_t PROGMEM analog_pin_to_channel_PGM[];
#define analogPinToChannel(P) ( pgm_read_byte( analog_pin_to_channel_PGM + (P) ) ) #define analogPinToChannel(P) ( pgm_read_byte( analog_pin_to_channel_PGM + (P) ) )
#define digitalPinHasPWM(p) ((p) == 3 || (p) == 5 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 11 || (p) == 13)
#define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : NOT_AN_INTERRUPT))))) #define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : NOT_AN_INTERRUPT)))))
#ifdef ARDUINO_MAIN #ifdef ARDUINO_MAIN
@ -171,8 +175,8 @@ extern const uint8_t PROGMEM analog_pin_to_channel_PGM[];
// MOSI D16 PB2 MOSI,PCINT2 // MOSI D16 PB2 MOSI,PCINT2
// SS D17 PB0 RXLED,SS/PCINT0 // SS D17 PB0 RXLED,SS/PCINT0
// //
// TXLED PD5 // TXLED D30 PD5 XCK1
// RXLED PB0 // RXLED D17 PB0
// HWB PE2 HWB // HWB PE2 HWB
// these arrays map port names (e.g. port B) to the // these arrays map port names (e.g. port B) to the
@ -243,6 +247,7 @@ const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
PB, // D27 / D9 - A9 - PB5 PB, // D27 / D9 - A9 - PB5
PB, // D28 / D10 - A10 - PB6 PB, // D28 / D10 - A10 - PB6
PD, // D29 / D12 - A11 - PD6 PD, // D29 / D12 - A11 - PD6
PD, // D30 / TX Led - PD5
}; };
const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = { const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = {
@ -280,6 +285,7 @@ const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = {
_BV(5), // D27 / D9 - A9 - PB5 _BV(5), // D27 / D9 - A9 - PB5
_BV(6), // D28 / D10 - A10 - PB6 _BV(6), // D28 / D10 - A10 - PB6
_BV(6), // D29 / D12 - A11 - PD6 _BV(6), // D29 / D12 - A11 - PD6
_BV(5), // D30 / TX Led - PD5
}; };
const uint8_t PROGMEM digital_pin_to_timer_PGM[] = { const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
@ -317,6 +323,7 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
NOT_ON_TIMER, NOT_ON_TIMER,
NOT_ON_TIMER, NOT_ON_TIMER,
NOT_ON_TIMER, NOT_ON_TIMER,
NOT_ON_TIMER,
}; };
const uint8_t PROGMEM analog_pin_to_channel_PGM[] = { const uint8_t PROGMEM analog_pin_to_channel_PGM[] = {