Skip to content

Commit 7716ebb

Browse files
committed
update BLM badge for uart (used in testing)
1 parent 812399f commit 7716ebb

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

variants/blm_badge/variant.cpp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ const PinDescription g_APinDescription[]=
3131
{ PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[0]
3232

3333
// GPIO 2 - Cap touch 2
34-
{ PORTA, 4, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel4, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_4 }, // TCC0/WO[0]
34+
{ PORTA, 4, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel4, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_4 }, // TCC0/WO[0]
3535

3636
// GPIO 3 - Cap touch 3
37-
{ PORTA, 6, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel6, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_6 }, // TCC1/WO[0]
37+
{ PORTA, 6, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel6, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_6 }, // TCC1/WO[0]
3838

3939
// GPIO 4 - Cap touch 4
40-
{ PORTA, 7, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel7, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_7 }, // TCC1/WO[1]
40+
{ PORTA, 7, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel7, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_7 }, // TCC1/WO[1]
4141

4242
// GPIO 5 - Stemma I2C SDA
4343
{ PORTA, 0, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_0 }, // SDA
@@ -88,13 +88,8 @@ SERCOM sercom3( SERCOM3 ) ;
8888

8989
Uart Serial1( &sercom0, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
9090

91-
92-
// If wire.h isnt included, just do nothing
93-
void WIRE_IT_HANDLER(void) __attribute__ ((weak));
94-
95-
void SERCOM1_Handler()
91+
void SERCOM0_Handler()
9692
{
9793
Serial1.IrqHandler();
98-
WIRE_IT_HANDLER();
9994
}
10095

variants/blm_badge/variant.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ static const uint8_t DAC0 = PIN_DAC0;
114114
*/
115115

116116
// Serial1 (sercom 0)
117-
#define PIN_SERIAL1_RX (6ul) // same as SCL
118-
#define PAD_SERIAL1_RX (SERCOM_RX_PAD_1)
119-
#define PIN_SERIAL1_TX (5ul) // same as SDA
117+
#define PIN_SERIAL1_RX (3ul) // captouch pad
118+
#define PAD_SERIAL1_RX (SERCOM_RX_PAD_2)
119+
#define PIN_SERIAL1_TX (2ul) // captouch pad
120120
#define PAD_SERIAL1_TX (UART_TX_PAD_0)
121121

122122
/*

0 commit comments

Comments
 (0)