From 2659e41c00dba4e34aaa38feb1dd3437ac462f5f Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Sun, 25 Nov 2012 15:46:34 +0100 Subject: Extended digital_pin_to_timer_PGM array in variants/leonardo/pins_arduino.h to include analog pins (fixed #1129) --- variants/leonardo/pins_arduino.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'variants/leonardo') diff --git a/variants/leonardo/pins_arduino.h b/variants/leonardo/pins_arduino.h index 42f2dd1..c2ce096 100644 --- a/variants/leonardo/pins_arduino.h +++ b/variants/leonardo/pins_arduino.h @@ -278,7 +278,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[30] = { NOT_ON_TIMER, NOT_ON_TIMER, NOT_ON_TIMER, @@ -298,6 +298,21 @@ 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] = { -- cgit v1.2.3-18-g5258 From 0a40c644719ebe3434b4d66276cbd0ae205c7159 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Fri, 30 Nov 2012 15:10:51 +0100 Subject: Leonardo pins_arduino.h fixes (jrcutler) fixes #915 --- variants/leonardo/pins_arduino.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'variants/leonardo') diff --git a/variants/leonardo/pins_arduino.h b/variants/leonardo/pins_arduino.h index c2ce096..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[30] = { +const uint8_t PROGMEM digital_pin_to_timer_PGM[] = { NOT_ON_TIMER, NOT_ON_TIMER, NOT_ON_TIMER, @@ -315,7 +318,7 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[30] = { 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 -- cgit v1.2.3-18-g5258