diff options
| author | Cristian Maglie <c.maglie@arduino.cc> | 2015-11-24 16:36:50 +0100 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@arduino.cc> | 2015-11-24 16:44:51 +0100 |
| commit | 4dc36e82ddfc9ef7b9eb567eb7ef59113f3a00a6 (patch) | |
| tree | 4ed0280bf734d5a8002862b3096fc4b4231d7b68 /variants | |
| parent | 2cc5f73b081e4c5b62c2217f62a4bd16d542ae72 (diff) | |
| parent | e13d186218a3ed537532876e6f82862f18667af6 (diff) | |
Merge branch 'led_fix' of https://github.com/NicoHood/Arduino
Diffstat (limited to 'variants')
| -rw-r--r-- | variants/leonardo/pins_arduino.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/variants/leonardo/pins_arduino.h b/variants/leonardo/pins_arduino.h index 115974e..6027223 100644 --- a/variants/leonardo/pins_arduino.h +++ b/variants/leonardo/pins_arduino.h @@ -88,7 +88,7 @@ #undef OCR2_6 #undef OCR2_7 -#define NUM_DIGITAL_PINS 30 +#define NUM_DIGITAL_PINS 31 #define NUM_ANALOG_INPUTS 12 #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 SCL = 3; #define LED_BUILTIN 13 +#define LED_BUILTIN_RX 17 +#define LED_BUILTIN_TX 30 // Map SPI port to 'new' pins D14..D17 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[]; #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))))) #ifdef ARDUINO_MAIN @@ -171,8 +175,8 @@ extern const uint8_t PROGMEM analog_pin_to_channel_PGM[]; // MOSI D16 PB2 MOSI,PCINT2 // SS D17 PB0 RXLED,SS/PCINT0 // -// TXLED PD5 -// RXLED PB0 +// TXLED D30 PD5 XCK1 +// RXLED D17 PB0 // HWB PE2 HWB // 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, // D28 / D10 - A10 - PB6 PD, // D29 / D12 - A11 - PD6 + PD, // D30 / TX Led - PD5 }; 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(6), // D28 / D10 - A10 - PB6 _BV(6), // D29 / D12 - A11 - PD6 + _BV(5), // D30 / TX Led - PD5 }; 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, }; const uint8_t PROGMEM analog_pin_to_channel_PGM[] = { |