Skip to content

Commit 3b3441b

Browse files
committed
fix i2c
1 parent 6047802 commit 3b3441b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

variants/trinket_m0/variant.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ const PinDescription g_APinDescription[]=
120120
// 2..12
121121
// Digital Low
122122
{ PORTA, 14, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_14 },
123-
{ PORTA, 9, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH1, TCC0_CH1, EXTERNAL_INT_9 }, // TCC0/WO[1]
124-
{ PORTA, 8, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI }, // TCC0/WO[0]
123+
{ PORTA, 9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH1, TCC0_CH1, EXTERNAL_INT_9 }, // TCC0/WO[1]
124+
{ PORTA, 8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI }, // TCC0/WO[0]
125125
{ PORTA, 15, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_15 }, // TC3/WO[1]
126126
{ PORTA, 20, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_4 }, // TCC0/WO[6]
127127
{ PORTA, 21, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 },

variants/trinket_m0/variant.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static const uint8_t ATN = PIN_ATN;
132132
#define PIN_SPI_MISO (3u) // PA09
133133
#define PIN_SPI_MOSI (1u) // PA10
134134
#define PIN_SPI_SCK (0u) // PA11
135-
#define PERIPH_SPI sercom2
135+
#define PERIPH_SPI sercom3
136136
#define PAD_SPI_TX SPI_PAD_2_SCK_3
137137
#define PAD_SPI_RX SERCOM_RX_PAD_1
138138

@@ -142,14 +142,15 @@ static const uint8_t MISO = PIN_SPI_MISO ;
142142
static const uint8_t SCK = PIN_SPI_SCK ;
143143

144144
/*
145-
* Wire Interfaces (sercom 2 so can share with sercom 0)
145+
* Wire Interfaces (sercom 2 so can share with Serial1 on sercom 0)
146146
*/
147147
#define WIRE_INTERFACES_COUNT 1
148148

149149
#define PIN_WIRE_SDA (4u) // PA08
150150
#define PIN_WIRE_SCL (3u) // PA09
151151
#define PERIPH_WIRE sercom2
152152
#define WIRE_IT_HANDLER SERCOM2_Handler
153+
153154

154155
static const uint8_t SDA = PIN_WIRE_SDA;
155156
static const uint8_t SCL = PIN_WIRE_SCL;

0 commit comments

Comments
 (0)