Skip to content

Commit 5df9f65

Browse files
author
ladyada
committed
rev C
1 parent 6af6f7e commit 5df9f65

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

‎variants/pyportal_m4/variant.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,33 +45,33 @@ const PinDescription g_APinDescription[]=
4545

4646
// 2..4
4747
{ PORTB, 22, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // NEOPIX
48-
{ PORTB, 0, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel12 , NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_0 }, // D3 (SENSE JST)
49-
{ PORTB, 1, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel13 , NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_1 }, // D4 (NEOPIX JST)
48+
{ PORTA, 4, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel4 , TC0_CH0 , TC0_CH0 , EXTERNAL_INT_4 }, // D3 (SENSE JST)
49+
{ PORTA, 5, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel5 , TC0_CH1 , TC0_CH1 , EXTERNAL_INT_5 }, // D4 (NEOPIX JST)
5050

5151
// 5..12 ESP32 and TFT control lines
52-
{ PORTB, 14, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC5_CH0 , TC5_CH0 , EXTERNAL_INT_14 }, // ESP_BUSY
52+
{ PORTB, 16, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_0 }, // ESP_BUSY
5353
{ PORTB, 15, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC5_CH1 , TC5_CH1 , EXTERNAL_INT_15 }, // ESP_GPIO0
54-
{ PORTB, 16, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_0 }, // ESP_RST
55-
{ PORTA, 15, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC3_CH1 , TC3_CH1 , EXTERNAL_INT_15 }, // ESP_CS
54+
{ PORTB, 17, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_1 }, // ESP RESET
55+
{ PORTB, 14, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC5_CH0 , TC5_CH0 , EXTERNAL_INT_14 }, // ESP_CS
5656
{ PORTB, 4, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // TFT_RD
5757
{ PORTB, 5, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // TFT_RS
5858
{ PORTB, 6, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // TFT_CS
5959
{ PORTB, 7, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // TFT_TE
6060

6161
// 13 (LED)
62-
{ PORTA, 27, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 }, // D13 (LED)
62+
{ PORTB, 23, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // D13 (LED)
6363

6464
// 14..23 Analog pins
6565
{ PORTA, 2, PIO_ANALOG , PIN_ATTR_ANALOG , DAC_Channel0 , NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // AUDIO_OUT (A0)
66-
{ 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], Light sensor (A1)
67-
{ PORTA, 4, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel4 , TC0_CH0 , TC0_CH0 , EXTERNAL_INT_4 }, // TOUCH_YD
68-
{ PORTA, 5, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel5 , TC0_CH1 , TC0_CH1 , EXTERNAL_INT_5 }, // TOUCH_XL
66+
{ PORTA, 7, PIO_DIGITAL , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel7 , TC1_CH1 , TC1_CH1 , EXTERNAL_INT_7 }, // Light sensor (A1)
67+
{ PORTB, 0, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel12 , NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_0 }, // TOUCH_YD
68+
{ PORTB, 1, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel13 , NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_1 }, // TOUCH_XL
6969
{ PORTA, 6, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel6 , TC1_CH0 , TC1_CH0 , EXTERNAL_INT_6 }, // TOUCH_YU
7070
{ PORTB, 8, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel2 , TC4_CH0 , TC4_CH0 , EXTERNAL_INT_8 }, // TOUCH_XR
7171
{ PORTB, 2, PIO_SERCOM_ALT, (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel14 , NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // SDA (JST), SERCOM5/PAD[0] - analog copy
7272
{ PORTB, 3, PIO_SERCOM_ALT, (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel15 , NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 }, // SCL (JST), SERCOM5/PAD[1] - analog copy
73-
{ PORTB, 0, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel12 , NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_0 }, // D3 (SENSE JST) - analog copy
74-
{ PORTB, 1, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel13 , NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_1 }, // D4 (NEOPIX JST) - analog copy
73+
{ PORTA, 4, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel4 , TC0_CH0 , TC0_CH0 , EXTERNAL_INT_4 }, // D3 (SENSE JST)
74+
{ PORTA, 5, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel5 , TC0_CH1 , TC0_CH1 , EXTERNAL_INT_5 }, // D4 (NEOPIX JST)
7575

7676
// 24..26 more TFT control lines
7777
{ PORTA, 0, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC2_CH0 , TC2_CH0 , EXTERNAL_INT_0 }, // TFT_RESET
@@ -114,8 +114,8 @@ const PinDescription g_APinDescription[]=
114114
{ PORTA, 25, PIO_COM , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB D+
115115

116116
// 50..51
117-
{ PORTB, 17, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_1 }, // ESP RTS
118-
{ PORTB, 23, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // TFT_WR4, CCL/OUT[0]
117+
{ PORTA, 27, PIO_DIGITAL , PIN_ATTR_NONE , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 }, // Speaker shutdown
118+
{ PORTA, 15, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC3_CH1 , TC3_CH1 , EXTERNAL_INT_15 }, // ESP_RTS
119119

120120
} ;
121121

0 commit comments

Comments
 (0)