Skip to content

Commit 9453bd9

Browse files
committed
add second Wire
1 parent da5ef0b commit 9453bd9

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

variants/trellis_m4/variant.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ const PinDescription g_APinDescription[]=
2626
// 0..13 - Digital pins
2727
// ----------------------
2828
// 0/1 - SERCOM/UART (Serial1)
29-
{ PORTA, 12, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_12 }, // SERCOM 2.0
30-
{ PORTA, 13, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH7, TCC0_CH7, EXTERNAL_INT_13 }, // SERCOM 2.1
29+
{ PORTA, 12, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_12 }, // SERCOM 2.0
30+
{ PORTA, 13, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH7, TCC0_CH7, EXTERNAL_INT_13 }, // SERCOM 2.1
3131

3232
// 2..9 - columns
3333
{ PORTA, 14, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM1_CH2, TCC1_CH2, EXTERNAL_INT_14 }, // D4
@@ -90,7 +90,6 @@ const PinDescription g_APinDescription[]=
9090
{ PORTA, 31, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_15 },
9191

9292
// Unused
93-
9493
{ PORTB, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel14, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 },
9594
{ PORTB, 3, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel15, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 },
9695
{ PORTB, 8, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel2, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_8 },

variants/trellis_m4/variant.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,17 +141,23 @@ static const uint8_t SCK = PIN_SPI_SCK ;
141141
/*
142142
* Wire Interfaces
143143
*/
144-
#define WIRE_INTERFACES_COUNT 1
144+
#define WIRE_INTERFACES_COUNT 2
145145

146146
#define PIN_WIRE_SDA (21u)
147147
#define PIN_WIRE_SCL (22u)
148148
#define PERIPH_WIRE sercom4
149149
#define WIRE_IT_HANDLER SERCOM4_Handler
150-
151-
152150
static const uint8_t SDA = PIN_WIRE_SDA;
153151
static const uint8_t SCL = PIN_WIRE_SCL;
154152

153+
154+
#define PIN_WIRE1_SDA (0u)
155+
#define PIN_WIRE1_SCL (1u)
156+
#define PERIPH_WIRE1 sercom2
157+
#define WIRE1_IT_HANDLER SERCOM2_Handler
158+
static const uint8_t SDA1 = PIN_WIRE_SDA;
159+
static const uint8_t SCL1 = PIN_WIRE_SCL;
160+
155161
/*
156162
* USB
157163
*/

0 commit comments

Comments
 (0)