Skip to content

Commit 40cc8c0

Browse files
facchinmcmaglie
authored andcommitted
[MKRWAN] Enable second optional SPI for dumb mode
1 parent 5925471 commit 40cc8c0

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

variants/mkrlora1300/variant.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ const PinDescription g_APinDescription[] = {
143143
| 35 | | PA01 | XOUT32 | 01 | | | | | | 1/01 | TCC2/1 | | | |
144144
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
145145
*/
146-
// DIPO=3 DOPO=0
147146
{ PORTA, 12, PIO_SERCOM_ALT, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM4/PAD[0]
148147
{ PORTA, 13, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM4/PAD[1]
149148
{ PORTA, 14, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SS: as GPIO
@@ -156,6 +155,10 @@ const PinDescription g_APinDescription[] = {
156155

157156
{ PORTA, 0, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
158157
{ PORTA, 1, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
158+
159+
{ PORTA, 12, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM4/PAD[0]
160+
{ PORTA, 13, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM4/PAD[1]
161+
{ PORTA, 15, PIO_SERCOM, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM4/PAD[3]
159162
};
160163

161164
const void* g_apTCInstances[TCC_INST_NUM + TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 };
@@ -182,4 +185,4 @@ Uart Serial2(&sercom4, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIA
182185
void SERCOM4_Handler()
183186
{
184187
Serial2.IrqHandler();
185-
}
188+
}

variants/mkrlora1300/variant.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static const uint8_t A6 = PIN_A6;
9292

9393
// SPI Interfaces
9494
// --------------
95-
#define SPI_INTERFACES_COUNT 1
95+
#define SPI_INTERFACES_COUNT 2
9696

9797
// SPI
9898
#define PIN_SPI_MISO (10u)
@@ -108,6 +108,18 @@ static const uint8_t MOSI = PIN_SPI_MOSI;
108108
static const uint8_t MISO = PIN_SPI_MISO;
109109
static const uint8_t SCK = PIN_SPI_SCK;
110110

111+
// SPI1
112+
#define PIN_SPI1_MISO (38u)
113+
#define PIN_SPI1_MOSI (36u)
114+
#define PIN_SPI1_SCK (37u)
115+
#define LORA_IRQ_DUMB (28u)
116+
#define PERIPH_SPI1 sercom2
117+
#define PAD_SPI1_TX SPI_PAD_0_SCK_1
118+
#define PAD_SPI1_RX SERCOM_RX_PAD_3
119+
static const uint8_t MOSI1 = PIN_SPI1_MOSI;
120+
static const uint8_t MISO1 = PIN_SPI1_MISO;
121+
static const uint8_t SCK1 = PIN_SPI1_SCK;
122+
111123
// Wire Interfaces
112124
// ---------------
113125
#define WIRE_INTERFACES_COUNT 1

0 commit comments

Comments
 (0)