Skip to content

Commit a69fbe3

Browse files
agdlagdl
authored
Merge pull request #378 from sandeepmistry/MKR-sercom-juggle
MKR boards: I2C to sercom2, SPI1 + Serial2 to sercom4
2 parents 3b6466b + f0ca3af commit a69fbe3

File tree

14 files changed

+59
-59
lines changed

14 files changed

+59
-59
lines changed

‎variants/mkr1000/variant.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ const PinDescription g_APinDescription[] = {
7171
{ PORTA, 19, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER ), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_NONE }, // MISO: SERCOM1/PAD[3]
7272

7373
// PINOUT=0
74-
{ PORTA, 8, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER ), ADC_Channel16, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI }, // SDA: SERCOM0/PAD[0]
75-
{ PORTA, 9, PIO_SERCOM, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM0/PAD[1]
74+
{ PORTA, 8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER ), ADC_Channel16, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI }, // SDA: SERCOM4/PAD[0]
75+
{ PORTA, 9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM4/PAD[1]
7676

7777
// RXPO=3 TXPO=1
7878
{ PORTB, 23, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // RX: SERCOM5/PAD[3]
@@ -146,10 +146,10 @@ const PinDescription g_APinDescription[] = {
146146
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
147147
*/
148148
// DIPO=3 DOPO=0
149-
{ PORTA, 12, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM2/PAD[0]
150-
{ PORTA, 13, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM2/PAD[1]
149+
{ PORTA, 12, PIO_SERCOM_ALT, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM4/PAD[0]
150+
{ PORTA, 13, PIO_SERCOM_ALT, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM4/PAD[1]
151151
{ PORTA, 14, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SS: as GPIO
152-
{ PORTA, 15, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM2/PAD[3]
152+
{ PORTA, 15, PIO_SERCOM_ALT, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM4/PAD[3]
153153

154154
{ PORTA, 27, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
155155
{ PORTA, 28, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },

‎variants/mkr1000/variant.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
109109
#define PIN_SPI1_MOSI (26u)
110110
#define PIN_SPI1_SCK (27u)
111111
#define PIN_SPI1_SS (28u)
112-
#define PERIPH_SPI1 sercom2
112+
#define PERIPH_SPI1 sercom4
113113
#define PAD_SPI1_TX SPI_PAD_0_SCK_1
114114
#define PAD_SPI1_RX SERCOM_RX_PAD_3
115115
static const uint8_t SS1 = PIN_SPI1_SS;
@@ -124,8 +124,8 @@ static const uint8_t SCK1 = PIN_SPI1_SCK;
124124
// Wire
125125
#define PIN_WIRE_SDA (11u)
126126
#define PIN_WIRE_SCL (12u)
127-
#define PERIPH_WIRE sercom0
128-
#define WIRE_IT_HANDLER SERCOM0_Handler
127+
#define PERIPH_WIRE sercom2
128+
#define WIRE_IT_HANDLER SERCOM2_Handler
129129
static const uint8_t SDA = PIN_WIRE_SDA;
130130
static const uint8_t SCL = PIN_WIRE_SCL;
131131

‎variants/mkrfox1200/variant.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ const PinDescription g_APinDescription[] = {
7171
{ PORTA, 19, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER ), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_NONE }, // MISO: SERCOM1/PAD[3]
7272

7373
// PINOUT=0
74-
{ PORTA, 8, PIO_SERCOM, (PIN_ATTR_DIGITAL ), ADC_Channel16, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NMI }, // SDA: SERCOM0/PAD[0]
75-
{ PORTA, 9, PIO_SERCOM, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM0/PAD[1]
74+
{ PORTA, 8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), ADC_Channel16, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NMI }, // SDA: SERCOM2/PAD[0]
75+
{ PORTA, 9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM2/PAD[1]
7676

7777
// RXPO=3 TXPO=1
7878
{ PORTB, 23, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // RX: SERCOM5/PAD[3]
@@ -144,10 +144,10 @@ const PinDescription g_APinDescription[] = {
144144
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
145145
*/
146146
// DIPO=3 DOPO=0
147-
{ PORTA, 12, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM2/PAD[0]
148-
{ PORTA, 13, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM2/PAD[1]
147+
{ PORTA, 12, PIO_SERCOM_ALT, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM4/PAD[0]
148+
{ PORTA, 13, PIO_SERCOM_ALT, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM4/PAD[1]
149149
{ PORTA, 14, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SS: as GPIO
150-
{ PORTA, 15, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM2/PAD[3]
150+
{ PORTA, 15, PIO_SERCOM_ALT, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM4/PAD[3]
151151
{ PORTA, 27, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
152152

153153
{ PORTA, 28, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },

‎variants/mkrfox1200/variant.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
112112
#define PIN_SIGFOX_RES (30u)
113113
#define PIN_SIGFOX_PWRON (31u)
114114
#define PIN_SIGFOX_EVENT (33u)
115-
#define PERIPH_SPI1 sercom2
115+
#define PERIPH_SPI1 sercom4
116116
#define PAD_SPI1_TX SPI_PAD_0_SCK_1
117117
#define PAD_SPI1_RX SERCOM_RX_PAD_3
118118
static const uint8_t SS1 = PIN_SPI1_SS;
@@ -137,8 +137,8 @@ static const uint8_t SCK1 = PIN_SPI1_SCK;
137137
// Wire
138138
#define PIN_WIRE_SDA (11u)
139139
#define PIN_WIRE_SCL (12u)
140-
#define PERIPH_WIRE sercom0
141-
#define WIRE_IT_HANDLER SERCOM0_Handler
140+
#define PERIPH_WIRE sercom2
141+
#define WIRE_IT_HANDLER SERCOM2_Handler
142142

143143
// USB
144144
// ---

‎variants/mkrgsm1400/variant.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ const PinDescription g_APinDescription[] = {
7272
{ PORTA, 19, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER ), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_NONE }, // MISO: SERCOM1/PAD[3]
7373

7474
// PINOUT=0
75-
{ PORTA, 8, PIO_SERCOM, (PIN_ATTR_DIGITAL ), ADC_Channel16, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NMI }, // SDA: SERCOM0/PAD[0]
76-
{ PORTA, 9, PIO_SERCOM, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM0/PAD[1]
75+
{ PORTA, 8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), ADC_Channel16, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NMI }, // SDA: SERCOM2/PAD[0]
76+
{ PORTA, 9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM2/PAD[1]
7777

7878
// RXPO=3 TXPO=1
7979
{ PORTB, 23, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // RX: SERCOM5/PAD[3]
@@ -146,10 +146,10 @@ const PinDescription g_APinDescription[] = {
146146
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
147147
*/
148148
// DIPO=3 DOPO=0
149-
{ PORTA, 12, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM2/PAD[0]
150-
{ PORTA, 13, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM2/PAD[1]
151-
{ PORTA, 14, PIO_SERCOM, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SS: as GPIO
152-
{ PORTA, 15, PIO_SERCOM, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM2/PAD[3]
149+
{ PORTA, 12, PIO_SERCOM_ALT, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM4/PAD[0]
150+
{ PORTA, 13, PIO_SERCOM_ALT, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM4/PAD[1]
151+
{ PORTA, 14, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SS: as GPIO
152+
{ PORTA, 15, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM4/PAD[3]
153153
{ PORTA, 27, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_15 },
154154

155155
{ PORTB, 8, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_ANALOG ), ADC_Channel2, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
@@ -244,9 +244,9 @@ void SERCOM5_Handler()
244244
}
245245

246246
// SerialGSM
247-
Uart Serial2(&sercom2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX, PIN_SERIAL2_RTS, PIN_SERIAL2_CTS);
247+
Uart Serial2(&sercom4, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX, PIN_SERIAL2_RTS, PIN_SERIAL2_CTS);
248248

249-
void SERCOM2_Handler()
249+
void SERCOM4_Handler()
250250
{
251251
Serial2.IrqHandler();
252252
}

‎variants/mkrgsm1400/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ static const uint8_t SCK = PIN_SPI_SCK;
117117
// Wire
118118
#define PIN_WIRE_SDA (11u)
119119
#define PIN_WIRE_SCL (12u)
120-
#define PERIPH_WIRE sercom0
121-
#define WIRE_IT_HANDLER SERCOM0_Handler
120+
#define PERIPH_WIRE sercom2
121+
#define WIRE_IT_HANDLER SERCOM2_Handler
122122

123123
// USB
124124
// ---

‎variants/mkrnb1500/variant.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ const PinDescription g_APinDescription[] = {
7272
{ PORTA, 19, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER ), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_NONE }, // MISO: SERCOM1/PAD[3]
7373

7474
// PINOUT=0
75-
{ PORTA, 8, PIO_SERCOM, (PIN_ATTR_DIGITAL ), ADC_Channel16, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NMI }, // SDA: SERCOM0/PAD[0]
76-
{ PORTA, 9, PIO_SERCOM, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM0/PAD[1]
75+
{ PORTA, 8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), ADC_Channel16, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NMI }, // SDA: SERCOM2/PAD[0]
76+
{ PORTA, 9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM2/PAD[1]
7777

7878
// RXPO=3 TXPO=1
7979
{ PORTB, 23, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // RX: SERCOM5/PAD[3]
@@ -146,10 +146,10 @@ const PinDescription g_APinDescription[] = {
146146
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
147147
*/
148148
// DIPO=3 DOPO=0
149-
{ PORTA, 12, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM2/PAD[0]
150-
{ PORTA, 13, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM2/PAD[1]
151-
{ PORTA, 14, PIO_SERCOM, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SS: as GPIO
152-
{ PORTA, 15, PIO_SERCOM, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM2/PAD[3]
149+
{ PORTA, 12, PIO_SERCOM_ALT, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM4/PAD[0]
150+
{ PORTA, 13, PIO_SERCOM_ALT, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM4/PAD[1]
151+
{ PORTA, 14, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SS: as GPIO
152+
{ PORTA, 15, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM4/PAD[3]
153153
{ PORTA, 27, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_15 },
154154

155155
{ PORTB, 8, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_ANALOG ), ADC_Channel2, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
@@ -248,9 +248,9 @@ void SERCOM5_Handler()
248248
}
249249

250250
// SerialSARA
251-
Uart Serial2(&sercom2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX);
251+
Uart Serial2(&sercom4, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX);
252252

253-
void SERCOM2_Handler()
253+
void SERCOM4_Handler()
254254
{
255255
Serial2.IrqHandler();
256256
}

‎variants/mkrnb1500/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ static const uint8_t SCK = PIN_SPI_SCK;
118118
// Wire
119119
#define PIN_WIRE_SDA (11u)
120120
#define PIN_WIRE_SCL (12u)
121-
#define PERIPH_WIRE sercom0
122-
#define WIRE_IT_HANDLER SERCOM0_Handler
121+
#define PERIPH_WIRE sercom2
122+
#define WIRE_IT_HANDLER SERCOM2_Handler
123123

124124
// USB
125125
// ---

‎variants/mkrwan1300/variant.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ const PinDescription g_APinDescription[] = {
7171
{ PORTA, 19, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER ), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_NONE }, // MISO: SERCOM1/PAD[3]
7272

7373
// PINOUT=0
74-
{ PORTA, 8, PIO_SERCOM, (PIN_ATTR_DIGITAL ), ADC_Channel16, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NMI }, // SDA: SERCOM0/PAD[0]
75-
{ PORTA, 9, PIO_SERCOM, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM0/PAD[1]
74+
{ PORTA, 8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), ADC_Channel16, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NMI }, // SDA: SERCOM2/PAD[0]
75+
{ PORTA, 9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM2/PAD[1]
7676

7777
// RXPO=3 TXPO=1
7878
{ PORTB, 23, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // RX: SERCOM5/PAD[3]

‎variants/mkrwan1300/variant.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
113113
#define PIN_SPI1_MOSI (36u)
114114
#define PIN_SPI1_SCK (37u)
115115
#define LORA_IRQ_DUMB (28u)
116-
#define PERIPH_SPI1 sercom2
116+
#define PERIPH_SPI1 sercom4
117117
#define PAD_SPI1_TX SPI_PAD_0_SCK_1
118118
#define PAD_SPI1_RX SERCOM_RX_PAD_3
119119
static const uint8_t MOSI1 = PIN_SPI1_MOSI;
@@ -127,8 +127,8 @@ static const uint8_t SCK1 = PIN_SPI1_SCK;
127127
// Wire
128128
#define PIN_WIRE_SDA (11u)
129129
#define PIN_WIRE_SCL (12u)
130-
#define PERIPH_WIRE sercom0
131-
#define WIRE_IT_HANDLER SERCOM0_Handler
130+
#define PERIPH_WIRE sercom2
131+
#define WIRE_IT_HANDLER SERCOM2_Handler
132132

133133
// USB
134134
// ---

0 commit comments

Comments
 (0)