Skip to content

Commit 74fc71a

Browse files
ladyadaladyada
committed
remove unavail timers!
1 parent 4cd8f8c commit 74fc71a

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

‎variants/pyportal_m4/variant.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ const PinDescription g_APinDescription[]=
4444
{ 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]
4545

4646
// 2..4
47-
{ PORTB, 22, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC7_CH0 , TC7_CH0 , EXTERNAL_INT_6 }, // NEOPIX
48-
{ PORTB, 0, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel12 , TC7_CH0 , TC7_CH0 , EXTERNAL_INT_0 }, // D3 (SENSE JST)
49-
{ PORTB, 1, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel13 , TC7_CH1 , TC7_CH1 , EXTERNAL_INT_1 }, // D4 (NEOPIX JST)
47+
{ 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)
5050

5151
// 5..12 ESP32 and TFT control lines
5252
{ PORTB, 14, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC5_CH0 , TC5_CH0 , EXTERNAL_INT_14 }, // 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, TC6_CH0 , TC6_CH0 , EXTERNAL_INT_0 }, // ESP_RST
54+
{ PORTB, 16, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_0 }, // ESP_RST
5555
{ PORTA, 15, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC3_CH1 , TC3_CH1 , EXTERNAL_INT_15 }, // 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
@@ -68,19 +68,19 @@ const PinDescription g_APinDescription[]=
6868
{ PORTA, 5, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel5 , TC0_CH1 , TC0_CH1 , EXTERNAL_INT_5 }, // 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
71-
{ 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] - analog copy
72-
{ 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] - analog copy
73-
{ PORTB, 0, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel12 , TC7_CH0 , TC7_CH0 , EXTERNAL_INT_0 }, // D3 (SENSE JST) - analog copy
74-
{ PORTB, 1, PIO_ANALOG , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel13 , TC7_CH1 , TC7_CH1 , EXTERNAL_INT_1 }, // D4 (NEOPIX JST) - analog copy
71+
{ 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
72+
{ 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
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
7878
{ PORTB, 31, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC0_CH1 , TC0_CH1 , EXTERNAL_INT_15 }, // TFT_BACKLITE
7979
{ PORTB, 9, PIO_DIGITAL , (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel3 , TC4_CH1 , TC4_CH1 , EXTERNAL_INT_9 }, // TFT_WR, CCL/OUT[2]
8080

8181
// 27..28 I2C pins
82-
{ 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]
83-
{ 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]
82+
{ 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]
83+
{ 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]
8484

8585
// 29..31 SPI pins
8686
{ PORTA, 12, PIO_SERCOM , PIN_ATTR_PWM_E , No_ADC_Channel, TC2_CH0 , TC2_CH0 , EXTERNAL_INT_12 }, // MOSI, SERCOM2/PAD[0]
@@ -96,8 +96,8 @@ const PinDescription g_APinDescription[]=
9696
{ PORTA, 17, PIO_DIGITAL , PIN_ATTR_PWM_F , No_ADC_Channel, TCC1_CH1 , TC2_CH1 , EXTERNAL_INT_1 }, // LCD_DATA1
9797
{ PORTA, 18, PIO_DIGITAL , PIN_ATTR_PWM_F , No_ADC_Channel, TCC1_CH2 , TC3_CH0 , EXTERNAL_INT_2 }, // LCD_DATA2
9898
{ PORTA, 19, PIO_DIGITAL , PIN_ATTR_PWM_F , No_ADC_Channel, TCC1_CH3 , TC3_CH1 , EXTERNAL_INT_3 }, // LCD_DATA3
99-
{ PORTA, 20, PIO_DIGITAL , PIN_ATTR_PWM_G , No_ADC_Channel, TCC0_CH0 , TC7_CH0 , EXTERNAL_INT_4 }, // LCD_DATA4
100-
{ PORTA, 21, PIO_DIGITAL , PIN_ATTR_PWM_G , No_ADC_Channel, TCC0_CH0 , TC7_CH1 , EXTERNAL_INT_5 }, // LCD_DATA5
99+
{ PORTA, 20, PIO_DIGITAL , PIN_ATTR_PWM_G , No_ADC_Channel, TCC0_CH0 , TC0_CH0 , EXTERNAL_INT_4 }, // LCD_DATA4
100+
{ PORTA, 21, PIO_DIGITAL , PIN_ATTR_PWM_G , No_ADC_Channel, TCC0_CH0 , TC0_CH1 , EXTERNAL_INT_5 }, // LCD_DATA5
101101
{ PORTA, 22, PIO_DIGITAL , PIN_ATTR_PWM_G , No_ADC_Channel, TCC0_CH2 , TC4_CH0 , EXTERNAL_INT_6 }, // LCD_DATA6
102102
{ PORTA, 23, PIO_DIGITAL , PIN_ATTR_PWM_G , No_ADC_Channel, TCC0_CH3 , TC4_CH1 , EXTERNAL_INT_7 }, // LCD_DATA7
103103

@@ -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 TFT alt WR lines for testing
117-
{ PORTB, 17, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC6_CH1 , TC6_CH1 , EXTERNAL_INT_1 }, // TFT_WR3, CCL/OUT[3]
118-
{ PORTB, 23, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, TC7_CH1 , TC7_CH1 , EXTERNAL_INT_7 }, // TFT_WR4, CCL/OUT[0]
117+
{ PORTB, 17, PIO_DIGITAL , PIN_ATTR_PWM_E , No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_1 }, // TFT_WR3, CCL/OUT[3]
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]
119119

120120
} ;
121121

‎variants/pyportal_m4/variant.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ extern "C"
102102
#define PIN_A7 (PIN_A0 + 7)
103103
#define PIN_A8 (PIN_A0 + 8)
104104
#define PIN_A9 (PIN_A0 + 9)
105-
#define PIN_DAC PIN_A0
106105
#define PIN_DAC0 PIN_A0
107106

108107
static const uint8_t A0 = PIN_A0;
@@ -116,7 +115,6 @@ static const uint8_t A7 = PIN_A7;
116115
static const uint8_t A8 = PIN_A8;
117116
static const uint8_t A9 = PIN_A9;
118117

119-
static const uint8_t DAC = PIN_DAC;
120118
static const uint8_t DAC0 = PIN_DAC0;
121119

122120
#define ADC_RESOLUTION 12

0 commit comments

Comments
 (0)