Skip to content

Commit 1ea494e

Browse files
Pin desc WIP
1 parent b0ec445 commit 1ea494e

File tree

1 file changed

+29
-47
lines changed

1 file changed

+29
-47
lines changed

variants/pyportal/variant.cpp

Lines changed: 29 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,19 @@
2525

2626
/* NEW PIN DEFS IN PROGRESS:
2727
28-
{ PORTA, 0, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC2_CH0 , TC2_CH0 , EXTERNAL_INT_0 }, // TFT_RESET
2928
{ PORTA, 1, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC2_CH1 , TC2_CH1 , EXTERNAL_INT_1 }, // CARDDET
3029
{ PORTA, 2, PIO_ANALOG , PIN_ATTR_ANALOG , DAC_Channel0 , NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // AUDIO_OUT
3130
{ PORTA, 3, PIO_ANALOG , PIN_ATTR_ANALOG , ADC_Channel1 , NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 }, // AREF
3231
{ PORTA, 4, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel4 , TC0_CH0 , TC0_CH0 , EXTERNAL_INT_4 }, // TOUCH_YD
3332
{ PORTA, 5, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel5 , TC0_CH1 , TC0_CH1 , EXTERNAL_INT_5 }, // TOUCH_XL
3433
{ PORTA, 6, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel6 , TC1_CH0 , TC1_CH0 , EXTERNAL_INT_6 }, // TOUCH_YU
35-
{ PORTA, 7, PIO_DIGITAL , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel7 , TC1_CH1 , TC1_CH1 , EXTERNAL_INT_7 }, // TFT_WR1, CCL/OUT[0]
3634
{ PORTA, 8, PIO_COM , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NMI }, // QSPI_DATA0
3735
{ PORTA, 9, PIO_COM , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_9 }, // QSPI_DATA1
3836
{ PORTA, 10, PIO_COM , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_10 }, // QSPI_DATA2
3937
{ PORTA, 11, PIO_COM , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 }, // QSPI_DATA3
4038
{ PORTA, 12, PIO_SERCOM , PIN_ATTR_PWM_E , No_ADC_Channel, TC2_CH0 , TC2_CH0 , EXTERNAL_INT_12 }, // MOSI, SERCOM2/PAD[0]
4139
{ PORTA, 13, PIO_SERCOM , PIN_ATTR_PWM_E , No_ADC_Channel, TC2_CH1 , TC2_CH1 , EXTERNAL_INT_13 }, // SCK, SERCOM2/PAD[1]
4240
{ PORTA, 14, PIO_SERCOM , PIN_ATTR_PWM_E , No_ADC_Channel, TC3_CH0 , TC3_CH0 , EXTERNAL_INT_14 }, // MISO, SERCOM2/PAD[2]
43-
{ PORTA, 15, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC3_CH1 , TC3_CH1 , EXTERNAL_INT_15 }, // ESP_CS
4441
{ PORTA, 16, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC2_CH0 , TC2_CH0 , EXTERNAL_INT_0 }, // LCD_DATA0
4542
{ PORTA, 17, PIO_DIGITAL , PIN_ATTR_PWM_F , No_ADC_Channel, TCC1_CH1 , TC2_CH1 , EXTERNAL_INT_1 }, // LCD_DATA1
4643
{ PORTA, 18, PIO_DIGITAL , PIN_ATTR_PWM_F , No_ADC_Channel, TCC1_CH2 , TC3_CH0 , EXTERNAL_INT_2 }, // LCD_DATA2
@@ -51,32 +48,15 @@
5148
{ PORTA, 23, PIO_DIGITAL , PIN_ATTR_PWM_G , No_ADC_Channel, TCC0_CH3 , TC4_CH1 , EXTERNAL_INT_7 }, // LCD_DATA7
5249
{ PORTA, 24, PIO_COM , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB D-
5350
{ PORTA, 25, PIO_COM , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB D+
54-
{ PORTA, 27, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 }, // D13 (LED)
5551
{ PORTA, 30, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC6_CH0 , TC6_CH0 , EXTERNAL_INT_14 }, // SWCLK
5652
{ PORTA, 31, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC6_CH1 , TC6_CH1 , EXTERNAL_INT_15 }, // SWDIO
5753
58-
{ PORTB, 0, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel12 , TC7_CH0 , TC7_CH0 , EXTERNAL_INT_0 }, // D3 (SENSE JST)
59-
{ PORTB, 1, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel13 , TC7_CH1 , TC7_CH1 , EXTERNAL_INT_1 }, // D4 (NEOPIX JST)
6054
{ PORTB, 2, PIO_SERCOM_ALT, (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel14 , TC6_CH0 , TC6_CH0 , EXTERNAL_INT_2 }, // SDA (JST), SERCOM5/PAD[0]
6155
{ PORTB, 3, PIO_SERCOM_ALT, (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel15 , TC6_CH1 , TC6_CH1 , EXTERNAL_INT_3 }, // SCL (JST), SERCOM5/PAD[1]
62-
{ PORTB, 4, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // TFT_RD
63-
{ PORTB, 5, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // TFT_RS
64-
{ PORTB, 6, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // TFT_CS
65-
{ PORTB, 7, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // TFT_TE
6656
{ PORTB, 8, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel2 , TC4_CH0 , TC4_CH0 , EXTERNAL_INT_8 }, // TOUCH_XR
67-
{ PORTB, 9, PIO_DIGITAL , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel3 , TC4_CH1 , TC4_CH1 , EXTERNAL_INT_9 }, // TFT_WR (wr2), CCL/OUT[2]
6857
{ PORTB, 10, PIO_COM , PIN_ATTR_NONE , No_ADC_Channel, TC5_CH0 , TC5_CH0 , EXTERNAL_INT_10 }, // QSPI_SCK
6958
{ PORTB, 11, PIO_COM , PIN_ATTR_NONE , No_ADC_Channel, TC5_CH1 , TC5_CH1 , EXTERNAL_INT_11 }, // QSPI_CS
70-
{ PORTB, 12, PIO_SERCOM , PIN_ATTR_NONE , No_ADC_Channel, TC4_CH0 , TCC3_CH0 , EXTERNAL_INT_12 }, // TXD (pin 1, to ESP32), SERCOM4/PAD[0]
71-
{ PORTB, 13, PIO_SERCOM , PIN_ATTR_NONE , No_ADC_Channel, TC4_CH1 , TCC3_CH1 , EXTERNAL_INT_13 }, // RXD (pin 0, to ESP32), SERCOM4/PAD[1]
72-
{ PORTB, 14, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC5_CH0 , TC5_CH0 , EXTERNAL_INT_14 }, // ESP_BUSY
73-
{ PORTB, 15, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC5_CH1 , TC5_CH1 , EXTERNAL_INT_15 }, // ESP_GPIO0
74-
{ PORTB, 16, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC6_CH0 , TC6_CH0 , EXTERNAL_INT_0 }, // ESP_RST
75-
{ PORTB, 17, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC6_CH1 , TC6_CH1 , EXTERNAL_INT_1 }, // TFT_WR3, CCL/OUT[3]
76-
{ PORTB, 22, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC7_CH0 , TC7_CH0 , EXTERNAL_INT_6 }, // NEOPIX
77-
{ PORTB, 23, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC7_CH1 , TC7_CH1 , EXTERNAL_INT_7 }, // TFT_WR4, CCL/OUT[0]
7859
{ PORTB, 30, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC0_CH0 , TC0_CH0 , EXTERNAL_INT_14 }, // SD_CS
79-
{ PORTB, 31, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC0_CH1 , TC0_CH1 , EXTERNAL_INT_15 }, // TFT_BACKLITE
8060
8161
*/
8262

@@ -89,36 +69,38 @@ const PinDescription g_APinDescription[]=
8969
// 0..13 - Digital pins
9070
// ----------------------
9171
// 0/1 - SERCOM/UART (Serial1)
92-
{ PORTA, 23, PIO_SERCOM, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH3, TC4_CH1, EXTERNAL_INT_7 }, // RX: SERCOM3/PAD[1]
93-
{ PORTA, 22, PIO_SERCOM, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH2, TC4_CH0, EXTERNAL_INT_6 }, // TX: SERCOM3/PAD[0]
94-
95-
// 2..12
96-
// Digital Low
97-
{ PORTB, 17, PIO_DIGITAL, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH5, NOT_ON_TIMER, EXTERNAL_INT_1 },
98-
{ PORTB, 16, PIO_DIGITAL, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH4, NOT_ON_TIMER, EXTERNAL_INT_0 },
99-
{ PORTB, 13, PIO_DIGITAL, PIN_ATTR_PWM_F, No_ADC_Channel, TCC3_CH1, TC4_CH1, EXTERNAL_INT_13 },
100-
{ PORTB, 14, PIO_DIGITAL, PIN_ATTR_PWM_F, No_ADC_Channel, TCC4_CH0, TC5_CH0, EXTERNAL_INT_14 },
101-
{ PORTB, 15, PIO_DIGITAL, PIN_ATTR_PWM_F, No_ADC_Channel, TCC4_CH1, TC5_CH1, EXTERNAL_INT_15 },
102-
{ PORTB, 12, PIO_DIGITAL, PIN_ATTR_PWM_F, No_ADC_Channel, TCC3_CH0, TC4_CH0, EXTERNAL_INT_12 },
103-
104-
// Digital High
105-
{ PORTA, 21, PIO_DIGITAL, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH1, NOT_ON_TIMER, EXTERNAL_INT_5 },
106-
{ PORTA, 20, PIO_DIGITAL, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH0, NOT_ON_TIMER, EXTERNAL_INT_4 },
107-
{ PORTA, 18, PIO_DIGITAL, PIN_ATTR_PWM_F, No_ADC_Channel, TCC1_CH2, TC3_CH0, EXTERNAL_INT_2 },
108-
{ PORTA, 19, PIO_DIGITAL, PIN_ATTR_PWM_F, No_ADC_Channel, TCC1_CH3, TC3_CH1, EXTERNAL_INT_3 },
109-
{ PORTA, 17, PIO_DIGITAL, PIN_ATTR_PWM_F, No_ADC_Channel, TCC1_CH1, TC2_CH1, EXTERNAL_INT_1 },
72+
{ PORTB, 13, PIO_SERCOM , PIN_ATTR_NONE , No_ADC_Channel, TC4_CH1 , TCC3_CH1 , EXTERNAL_INT_13 }, // RXD (pin 0, to ESP32), SERCOM4/PAD[1]
73+
{ PORTB, 12, PIO_SERCOM , PIN_ATTR_NONE , No_ADC_Channel, TC4_CH0 , TCC3_CH0 , EXTERNAL_INT_12 }, // TXD (pin 1, to ESP32), SERCOM4/PAD[0]
74+
75+
// 2..4
76+
{ PORTB, 22, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC7_CH0 , TC7_CH0 , EXTERNAL_INT_6 }, // NEOPIX
77+
{ PORTB, 0, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel12 , TC7_CH0 , TC7_CH0 , EXTERNAL_INT_0 }, // D3 (SENSE JST)
78+
{ PORTB, 1, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel13 , TC7_CH1 , TC7_CH1 , EXTERNAL_INT_1 }, // D4 (NEOPIX JST)
79+
80+
// 5..12
81+
{ PORTB, 14, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC5_CH0 , TC5_CH0 , EXTERNAL_INT_14 }, // ESP_BUSY
82+
{ PORTB, 15, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC5_CH1 , TC5_CH1 , EXTERNAL_INT_15 }, // ESP_GPIO0
83+
{ PORTB, 16, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC6_CH0 , TC6_CH0 , EXTERNAL_INT_0 }, // ESP_RST
84+
{ PORTA, 15, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC3_CH1 , TC3_CH1 , EXTERNAL_INT_15 }, // ESP_CS
85+
{ PORTB, 4, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // TFT_RD
86+
{ PORTB, 5, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // TFT_RS
87+
{ PORTB, 6, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // TFT_CS
88+
{ PORTB, 7, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // TFT_TE
11089

11190
// 13 (LED)
112-
{ PORTA, 16, PIO_DIGITAL, PIN_ATTR_PWM_F, No_ADC_Channel, TCC1_CH0, TC2_CH0, EXTERNAL_INT_0 },
91+
{ PORTA, 27, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 }, // D13 (LED)
92+
93+
// 14..19
94+
{ PORTA, 0, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC2_CH0 , TC2_CH0 , EXTERNAL_INT_0 }, // TFT_RESET
95+
{ PORTB, 31, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC0_CH1 , TC0_CH1 , EXTERNAL_INT_15 }, // TFT_BACKLITE
96+
{ PORTA, 7, PIO_DIGITAL , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel7 , TC1_CH1 , TC1_CH1 , EXTERNAL_INT_7 }, // TFT_WR1, CCL/OUT[0]
97+
{ PORTB, 9, PIO_DIGITAL , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel3 , TC4_CH1 , TC4_CH1 , EXTERNAL_INT_9 }, // TFT_WR (wr2), CCL/OUT[2]
98+
{ PORTB, 17, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC6_CH1 , TC6_CH1 , EXTERNAL_INT_1 }, // TFT_WR3, CCL/OUT[3]
99+
{ PORTB, 23, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC7_CH1 , TC7_CH1 , EXTERNAL_INT_7 }, // TFT_WR4, CCL/OUT[0]
100+
101+
102+
// STILL TO-DO BELOW THIS LINE ------
113103

114-
// 14..19 - Analog pins
115-
// --------------------
116-
{ PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 },
117-
{ PORTA, 5, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel5, NOT_ON_PWM, TC0_CH1, EXTERNAL_INT_5 },
118-
{ PORTA, 6, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel6, TC1_CH0, TC1_CH0, EXTERNAL_INT_6 },
119-
{ PORTA, 4, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel4, TC0_CH0, TC0_CH0, EXTERNAL_INT_4 },
120-
{ PORTB, 8, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel2, TC4_CH0, TC4_CH0, EXTERNAL_INT_8 },
121-
{ PORTB, 9, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel3, TC4_CH1, TC4_CH1, EXTERNAL_INT_9 },
122104

123105
// Extra Analog pins! 20..21
124106
{ PORTB, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel14, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // same as sda

0 commit comments

Comments
 (0)