Skip to content

Commit 97bedc7

Browse files
deanm1278ladyada
deanm1278
authored and
ladyada
committed
updates for pin numbering (arduino#68)
* DM: grandcentral variant * DM: updates for m4 mega * DM: metro mega updates * DM: fixes for mega m4 pcc * DM: fix grandcentral boards.txt naming * DM: remove openocd for samd51, fix include guards * DM: remove unnecessary debug scripts for m4 boards * DM: update grandcentral pin numbering
1 parent 9828191 commit 97bedc7

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎variants/grand_central_m4/variant.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,15 @@ const PinDescription g_APinDescription[]=
5353
// 13 (LED)
5454
{ PORTB, 1, PIO_DIGITAL, PIN_ATTR_PWM_E, No_ADC_Channel, TC7_CH1, TC7_CH1, EXTERNAL_INT_1 },
5555

56-
// 14..21 - Analog pins
57-
// --------------------
58-
{ PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 },
59-
{ PORTA, 5, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 },
60-
{ PORTB, 3, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel15, TC6_CH1, TC6_CH1, EXTERNAL_INT_3 },
61-
{ PORTC, 0, PIO_ANALOG, PIN_ATTR_ANALOG_ALT, ADC_Channel10, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_0 },
62-
{ PORTC, 1, PIO_ANALOG, PIN_ATTR_ANALOG_ALT, ADC_Channel11, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_1 },
63-
{ PORTC, 2, PIO_ANALOG, PIN_ATTR_ANALOG_ALT, ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 },
64-
{ PORTC, 3, PIO_ANALOG, PIN_ATTR_ANALOG_ALT, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 },
65-
{ PORTB, 4, PIO_ANALOG, PIN_ATTR_ANALOG_ALT, ADC_Channel6, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 },
56+
// 14..21 - UARTS
57+
{ PORTB, 16, PIO_SERCOM, PIN_ATTR_PWM_E, No_ADC_Channel, TC6_CH0, TC6_CH0, EXTERNAL_INT_0 }, // UART3_TX
58+
{ PORTB, 17, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_1 }, // UART3_RX
59+
{ PORTC, 22, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // UART2_TX
60+
{ PORTC, 23, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // UART2_RX
61+
{ PORTB, 12, PIO_SERCOM, PIN_ATTR_PWM_F, No_ADC_Channel, TCC3_CH0, NOT_ON_TIMER, EXTERNAL_INT_12 }, // UART1_TX
62+
{ PORTB, 13, PIO_SERCOM, PIN_ATTR_PWM_F, No_ADC_Channel, TCC3_CH1, NOT_ON_TIMER, EXTERNAL_INT_13 }, // UART1_RX
63+
{ PORTB, 20, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, //same as SDA
64+
{ PORTB, 21, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, //same as SCL
6665

6766
// 22..53 - Extra Digital Pins
6867
// ----------------------
@@ -127,15 +126,16 @@ const PinDescription g_APinDescription[]=
127126
{ PORTD, 8, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 }, // MOSI
128127
{ PORTD, 9, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // SCK
129128

130-
//67..74 - UARTS
131-
{ PORTB, 16, PIO_SERCOM, PIN_ATTR_PWM_E, No_ADC_Channel, TC6_CH0, TC6_CH0, EXTERNAL_INT_0 }, // UART3_TX
132-
{ PORTB, 17, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_1 }, // UART3_RX
133-
{ PORTC, 22, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // UART2_TX
134-
{ PORTC, 23, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // UART2_RX
135-
{ PORTB, 12, PIO_SERCOM, PIN_ATTR_PWM_F, No_ADC_Channel, TCC3_CH0, NOT_ON_TIMER, EXTERNAL_INT_12 }, // UART1_TX
136-
{ PORTB, 13, PIO_SERCOM, PIN_ATTR_PWM_F, No_ADC_Channel, TCC3_CH1, NOT_ON_TIMER, EXTERNAL_INT_13 }, // UART1_RX
137-
{ PORTB, 20, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, //same as SDA
138-
{ PORTB, 21, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, //same as SCL
129+
// 67..74 - Analog pins
130+
// --------------------
131+
{ PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 },
132+
{ PORTA, 5, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 },
133+
{ PORTB, 3, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel15, TC6_CH1, TC6_CH1, EXTERNAL_INT_3 },
134+
{ PORTC, 0, PIO_ANALOG, PIN_ATTR_ANALOG_ALT, ADC_Channel10, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_0 },
135+
{ PORTC, 1, PIO_ANALOG, PIN_ATTR_ANALOG_ALT, ADC_Channel11, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_1 },
136+
{ PORTC, 2, PIO_ANALOG, PIN_ATTR_ANALOG_ALT, ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 },
137+
{ PORTC, 3, PIO_ANALOG, PIN_ATTR_ANALOG_ALT, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 },
138+
{ PORTB, 4, PIO_ANALOG, PIN_ATTR_ANALOG_ALT, ADC_Channel6, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 },
139139

140140
// 75..76 - RX/TX LEDS
141141
// --------------------

‎variants/grand_central_m4/variant.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ extern "C"
9393
/*
9494
* Analog pins
9595
*/
96-
#define PIN_A0 (14ul)
96+
#define PIN_A0 (67ul)
9797
#define PIN_A1 (PIN_A0 + 1)
9898
#define PIN_A2 (PIN_A0 + 2)
9999
#define PIN_A3 (PIN_A0 + 3)
@@ -152,22 +152,22 @@ static const uint8_t ATN = PIN_ATN;
152152
#define PAD_SERIAL1_RX (SERCOM_RX_PAD_1)
153153

154154
// Serial2
155-
#define PIN_SERIAL2_RX (72ul)
156-
#define PIN_SERIAL2_TX (71ul)
155+
#define PIN_SERIAL2_RX (19ul)
156+
#define PIN_SERIAL2_TX (18ul)
157157
#define PAD_SERIAL2_TX (UART_TX_PAD_0)
158158
#define PAD_SERIAL2_RX (SERCOM_RX_PAD_1)
159159
#define SERCOM_SERIAL2 sercom4
160160

161161
// Serial3
162-
#define PIN_SERIAL3_RX (70ul)
163-
#define PIN_SERIAL3_TX (69ul)
162+
#define PIN_SERIAL3_RX (17ul)
163+
#define PIN_SERIAL3_TX (16ul)
164164
#define PAD_SERIAL3_TX (UART_TX_PAD_0)
165165
#define PAD_SERIAL3_RX (SERCOM_RX_PAD_1)
166166
#define SERCOM_SERIAL3 sercom1
167167

168168
// Serial4
169-
#define PIN_SERIAL4_RX (68ul)
170-
#define PIN_SERIAL4_TX (67ul)
169+
#define PIN_SERIAL4_RX (15ul)
170+
#define PIN_SERIAL4_TX (14ul)
171171
#define PAD_SERIAL4_TX (UART_TX_PAD_0)
172172
#define PAD_SERIAL4_RX (SERCOM_RX_PAD_1)
173173
#define SERCOM_SERIAL4 sercom5

0 commit comments

Comments
 (0)