updated for neopixel to be on #40 like the silkscreen

Author: ladyada

variants/metro_m4/variant.cpp

@@ -92,19 +92,22 @@ const PinDescription g_APinDescription[]=
   // 35 - Secondary SPI cs
   { PORTA,  16, PIO_DIGITAL, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_0  }, //same as d10
 
-  // 36 - Internal NeoPixel
-  { PORTB, 22, PIO_DIGITAL, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // used as output only
-
-  // 37 (AREF)
+  // 36 (AREF)
   { PORTA, 3, PIO_ANALOG, PIN_ATTR_ANALOG, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 }, // DAC/VREFP
 
   // ----------------------
-  // 38 - 39 Alternate use of A0 and A1 (DAC output)
+  // 37 - 38 Alternate use of A0 and A1 (DAC output)
   { PORTA,  2, PIO_ANALOG, PIN_ATTR_ANALOG, DAC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // DAC/VOUT[0]
   { PORTA,  5, PIO_ANALOG, PIN_ATTR_ANALOG, DAC_Channel1, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // DAC/VOUT[1]
 
+  // 39 - LED #13 duplicate placeholder
+  { PORTA,  16, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM1_CH0, NOT_ON_TIMER, EXTERNAL_INT_0  },
+
+  // 40 - Internal NeoPixel
+  { PORTB, 22, PIO_DIGITAL, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // used as output only
+
   // ----------------------
-  // 40 - 45 QSPI (SCK, CS, IO0, IO1, IO2, IO3)
+  // 41 - 46 QSPI (SCK, CS, IO0, IO1, IO2, IO3)
   { PORTB, 10, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_10 },
   { PORTB, 11, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 },
   { PORTA, 8, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NMI },

variants/metro_m4/variant.h

@@ -100,7 +100,7 @@ extern "C"
 #define PIN_A5               (PIN_A0 + 5)
 #define PIN_A6               (PIN_A0 + 6)
 #define PIN_A7               (PIN_A0 + 7)
-#define PIN_DAC0             (14ul)
+#define PIN_DAC0             PIN_A0
 #define PIN_DAC1             PIN_A1
 
 static const uint8_t A0  = PIN_A0;
@@ -118,7 +118,7 @@ static const uint8_t DAC1 = PIN_DAC1;
 #define ADC_RESOLUTION		12
 
 // Other pins
-#define PIN_ATN              (38ul)
+#define PIN_ATN              (39ul)
 static const uint8_t ATN = PIN_ATN;
 
 /*
@@ -196,12 +196,12 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 #define PIN_I2S_MCK			(2u)
 
 //QSPI Pins
-#define PIN_QSPI_SCK	(40u)
-#define PIN_QSPI_CS		(41u)
-#define PIN_QSPI_IO0	(42u)
-#define PIN_QSPI_IO1	(43u)
-#define PIN_QSPI_IO2	(44u)
-#define PIN_QSPI_IO3	(45u)
+#define PIN_QSPI_SCK	(41u)
+#define PIN_QSPI_CS	(42u)
+#define PIN_QSPI_IO0	(43u)
+#define PIN_QSPI_IO1	(44u)
+#define PIN_QSPI_IO2	(45u)
+#define PIN_QSPI_IO3	(46u)
 
 //PCC Pins
 #define PIN_PCC_DEN1    (PIN_SPI_MOSI)