diff options
| author | Federico Fissore <f.fissore@arduino.cc> | 2013-01-28 11:37:51 +0100 |
|---|---|---|
| committer | Federico Fissore <f.fissore@arduino.cc> | 2013-01-28 11:37:51 +0100 |
| commit | 5c67c7e5c674a572dd99e9d0d8c19c718c9985bc (patch) | |
| tree | 1f22ba2385ad22eca306d67793c0827451f2b50a /variants | |
| parent | c453e0a32e7adf5e7bab7bfb7c8f7a21e30ca563 (diff) | |
| parent | c6287dd6ac33544179a6544b8f3f55a396ec6608 (diff) | |
Merge branch 'ide-1.5.x' into lib-1.5
Diffstat (limited to 'variants')
| -rw-r--r-- | variants/leonardo/pins_arduino.h | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/variants/leonardo/pins_arduino.h b/variants/leonardo/pins_arduino.h index 42f2dd1..2c7f837 100644 --- a/variants/leonardo/pins_arduino.h +++ b/variants/leonardo/pins_arduino.h @@ -90,6 +90,9 @@ #undef OCR2_6 #undef OCR2_7 +#define NUM_DIGITAL_PINS 30 +#define NUM_ANALOG_INPUTS 12 + #define TX_RX_LED_INIT DDRD |= (1<<5), DDRB |= (1<<0) #define TXLED0 PORTD |= (1<<5) #define TXLED1 PORTD &= ~(1<<5) @@ -204,7 +207,7 @@ const uint16_t PROGMEM port_to_input_PGM[] = { (uint16_t) &PINF, }; -const uint8_t PROGMEM digital_pin_to_port_PGM[30] = { +const uint8_t PROGMEM digital_pin_to_port_PGM[] = { PD, // D0 - PD2 PD, // D1 - PD3 PD, // D2 - PD1 @@ -241,7 +244,7 @@ const uint8_t PROGMEM digital_pin_to_port_PGM[30] = { PD, // D29 / D12 - A11 - PD6 }; -const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[30] = { +const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = { _BV(2), // D0 - PD2 _BV(3), // D1 - PD3 _BV(1), // D2 - PD1 @@ -278,7 +281,7 @@ const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[30] = { _BV(6), // D29 / D12 - A11 - PD6 }; -const uint8_t PROGMEM digital_pin_to_timer_PGM[16] = { +const uint8_t PROGMEM digital_pin_to_timer_PGM[] = { NOT_ON_TIMER, NOT_ON_TIMER, NOT_ON_TIMER, @@ -298,9 +301,24 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[16] = { NOT_ON_TIMER, NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + 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[12] = { +const uint8_t PROGMEM analog_pin_to_channel_PGM[] = { 7, // A0 PF7 ADC7 6, // A1 PF6 ADC6 5, // A2 PF5 ADC5 |