DM: updated variant for rev B

adafruit · Oct 17, 2017 · 45f3eeb · 45f3eeb
1 parent ceafcf8
commit 45f3eeb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/variants/metro_m4/variant.cpp b/variants/metro_m4/variant.cpp
@@ -139,9 +139,9 @@ const PinDescription g_APinDescription[]=
 
   // 26..28 - SPI pins (ICSP:MISO,SCK,MOSI)
   // ----------------------
-  { PORTA,  15, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM2_CH1, TCC2_CH1, EXTERNAL_INT_15 },
-  { PORTA,  12, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM0_CH7, TCC0_CH7, EXTERNAL_INT_12 },
-  { PORTA,  13, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_13 },
+  { PORTA,  15, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM2_CH1, TCC2_CH1, EXTERNAL_INT_15 },
+  { PORTA,  12, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM0_CH7, TCC0_CH7, EXTERNAL_INT_12 },
+  { PORTA,  13, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_13 },
 
   // 29..30 - RX/TX LEDS (PB06/PA27)
   // --------------------

diff --git a/variants/metro_m4/variant.h b/variants/metro_m4/variant.h
@@ -139,20 +139,19 @@ static const uint8_t ATN = PIN_ATN;
 #define PIN_SPI_MISO         (26u)
 #define PIN_SPI_MOSI         (27u)
 #define PIN_SPI_SCK          (28u)
-#define PERIPH_SPI           sercom4
+#define PERIPH_SPI           sercom2
 #define PAD_SPI_TX           SPI_PAD_0_SCK_1
 #define PAD_SPI_RX           SERCOM_RX_PAD_3
 
-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.
+static const uint8_t SS	  = PIN_A2 ;	
 static const uint8_t MOSI = PIN_SPI_MOSI ;
 static const uint8_t MISO = PIN_SPI_MISO ;
 static const uint8_t SCK  = PIN_SPI_SCK ;
 
-//TODO: we may have to move SPI1 (SPI flash) to another sercom
 #define PIN_SPI1_MISO         (34u)
 #define PIN_SPI1_MOSI         (35u)
 #define PIN_SPI1_SCK          (36u)
-#define PERIPH_SPI1           sercom5
+#define PERIPH_SPI1           sercom4
 #define PAD_SPI1_TX           SPI_PAD_0_SCK_1
 #define PAD_SPI1_RX           SERCOM_RX_PAD_3