Skip to content

Commit 45f3eeb

Browse files
committed
DM: updated variant for rev B
1 parent ceafcf8 commit 45f3eeb

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

variants/metro_m4/variant.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ const PinDescription g_APinDescription[]=
139139

140140
// 26..28 - SPI pins (ICSP:MISO,SCK,MOSI)
141141
// ----------------------
142-
{ PORTA, 15, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM2_CH1, TCC2_CH1, EXTERNAL_INT_15 },
143-
{ PORTA, 12, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM0_CH7, TCC0_CH7, EXTERNAL_INT_12 },
144-
{ PORTA, 13, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_13 },
142+
{ PORTA, 15, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM2_CH1, TCC2_CH1, EXTERNAL_INT_15 },
143+
{ PORTA, 12, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM0_CH7, TCC0_CH7, EXTERNAL_INT_12 },
144+
{ PORTA, 13, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_13 },
145145

146146
// 29..30 - RX/TX LEDS (PB06/PA27)
147147
// --------------------

variants/metro_m4/variant.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,20 +139,19 @@ static const uint8_t ATN = PIN_ATN;
139139
#define PIN_SPI_MISO (26u)
140140
#define PIN_SPI_MOSI (27u)
141141
#define PIN_SPI_SCK (28u)
142-
#define PERIPH_SPI sercom4
142+
#define PERIPH_SPI sercom2
143143
#define PAD_SPI_TX SPI_PAD_0_SCK_1
144144
#define PAD_SPI_RX SERCOM_RX_PAD_3
145145

146-
static const uint8_t SS = PIN_A2 ; // SERCOM4 last PAD is present on A2 but HW SS isn't used. Set here only for reference.
146+
static const uint8_t SS = PIN_A2 ;
147147
static const uint8_t MOSI = PIN_SPI_MOSI ;
148148
static const uint8_t MISO = PIN_SPI_MISO ;
149149
static const uint8_t SCK = PIN_SPI_SCK ;
150150

151-
//TODO: we may have to move SPI1 (SPI flash) to another sercom
152151
#define PIN_SPI1_MISO (34u)
153152
#define PIN_SPI1_MOSI (35u)
154153
#define PIN_SPI1_SCK (36u)
155-
#define PERIPH_SPI1 sercom5
154+
#define PERIPH_SPI1 sercom4
156155
#define PAD_SPI1_TX SPI_PAD_0_SCK_1
157156
#define PAD_SPI1_RX SERCOM_RX_PAD_3
158157

0 commit comments

Comments
 (0)