all except QSPI tested (still having QSPI problems)

Author: ladyada

variants/feather_nrf52840_express/variant.cpp

@@ -27,14 +27,46 @@
 
 const uint32_t g_ADigitalPinMap[] =
 {
-  // P0
-  0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 ,
-  8 , 9 , 10, 11, 12, 13, 14, 15,
-  16, 17, 18, 19, 20, 21, 22, 23,
-  24, 25, 26, 27, 28, 29, 30, 31,
+  25,  // D0 is UART TX on P0.25
+  24,  // D1 is UART RX on P0.24 
+  10,  // D2 is on P0.10
+  47,  // D3 is LED1 on P1.15
+  42,  // D4 is LED2 on P1.10
+  40,  // D5 on P1.08
+  7,   // D6 on P0.07 
+  34,  // D7 is Button on P1.02
+  16,  // D8 is NeoPixel on P0.16
+  26,  // D9 on P0.26
+  27,  // D10 on P0.27 
+  6,   // D11 on P.06 
+  8,   // D12 on P0.08
+  41,  // D13 on P1.09 
+
+  4,   // D14 is A0 on P0.04
+  5,   // D15 is A1 on P0.05
+  30,  // D16 is A2 on P0.30
+  28,  // D17 is A3 on P0.28
+  2,   // D18 is A4 on P0.02
+  3,   // D19 is A5 on P0.03
+  29,  // D20 is A6 (Battery) on P0.29
+  31,  // D21 is A7 (ARef) on P0.31
+
+  12,  // D22 is SDA on P0.12
+  11,  // D23 is SCL on P0.11
+
+  15,  // D24 is SPI MISO on P0.15 
+  13,  // D25 is SPI MOSI on P0.13 
+  14,  // D26 is SPI SCK on P0.14 
+
+  19,  // D27 is QSPI CLK on P0.19
+  20,  // D28 is QSPI CS on P0.20
+  17,  // D29 is QSPI Data 0 on P0.17
+  22,  // D30 is QSPI Data 1 on P0.22
+  23,  // D31 is QSPI Data 2 on P0.23
+  21,  // D32 is QSPI Data 3 on P0.21
 
   // P1
-  32, 33, 34, 35, 36, 37, 38, 39,
+  33, 34, 35, 36, 37, 38, 39,
   40, 41, 42, 43, 44, 45, 46, 47,
   48, 49, 50, 51, 52, 53, 54, 55,
   56, 57, 58, 59, 60, 61, 62, 63

variants/feather_nrf52840_express/variant.h

@@ -43,10 +43,9 @@ extern "C"
 #define NUM_ANALOG_OUTPUTS   (0)
 
 // LEDs
-#define PIN_LED1             (13)
-#define PIN_LED2             (14)
-#define PIN_LED3             (15)
-#define PIN_NEOPIXEL         (16)
+#define PIN_LED1             (3)
+#define PIN_LED2             (4)
+#define PIN_NEOPIXEL         (8)
 
 #define LED_BUILTIN          PIN_LED1
 #define LED_CONN             PIN_LED2
@@ -67,14 +66,14 @@ extern "C"
 /*
  * Analog pins
  */
-#define PIN_A0               (3)
-#define PIN_A1               (4)
-#define PIN_A2               (28)
-#define PIN_A3               (29)
-#define PIN_A4               (30)
-#define PIN_A5               (31)
-#define PIN_A6               (0xff)
-#define PIN_A7               (0xff)
+#define PIN_A0               (14)
+#define PIN_A1               (15)
+#define PIN_A2               (16)
+#define PIN_A3               (17)
+#define PIN_A4               (18)
+#define PIN_A5               (19)
+#define PIN_A6               (20)
+#define PIN_A7               (21)
 
 static const uint8_t A0  = PIN_A0 ;
 static const uint8_t A1  = PIN_A1 ;
@@ -87,30 +86,30 @@ static const uint8_t A7  = PIN_A7 ;
 #define ADC_RESOLUTION    14
 
 // Other pins
-#define PIN_AREF           (2)
-#define PIN_DFU            (11)
-#define PIN_NFC1           (9)
-#define PIN_NFC2           (10)
+#define PIN_AREF           (PIN_A7)
+#define PIN_DFU            (7)
+#define PIN_NFC1           (2)
+#define PIN_NFC2           (51)
 
 static const uint8_t AREF = PIN_AREF;
 
 /*
  * Serial interfaces
  */
 // Serial
-#define PIN_SERIAL_RX       (8)
-#define PIN_SERIAL_TX       (6)
+#define PIN_SERIAL_RX       (1)
+#define PIN_SERIAL_TX       (0)
 
 /*
  * SPI Interfaces
  */
 #define SPI_INTERFACES_COUNT 1
 
-#define PIN_SPI_MISO         (41)
-#define PIN_SPI_MOSI         (40)
-#define PIN_SPI_SCK          (7)
+#define PIN_SPI_MISO         (24)
+#define PIN_SPI_MOSI         (25)
+#define PIN_SPI_SCK          (26)
 
-static const uint8_t SS   = 44 ;
+static const uint8_t SS   = (5);
 static const uint8_t MOSI = PIN_SPI_MOSI ;
 static const uint8_t MISO = PIN_SPI_MISO ;
 static const uint8_t SCK  = PIN_SPI_SCK ;
@@ -120,18 +119,18 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
  */
 #define WIRE_INTERFACES_COUNT 1
 
-#define PIN_WIRE_SDA         (26)
-#define PIN_WIRE_SCL         (27)
+#define PIN_WIRE_SDA         (22)
+#define PIN_WIRE_SCL         (23)
 
 /*
  * QSPI interface for external flash
  */
-#define PIN_QSPI_SCK         19
-#define PIN_QSPI_CS          17
-#define PIN_QSPI_DATA0       20
-#define PIN_QSPI_DATA1       21
-#define PIN_QSPI_DATA2       22
-#define PIN_QSPI_DATA3       23
+#define PIN_QSPI_SCK         27
+#define PIN_QSPI_CS          28
+#define PIN_QSPI_DATA0       29
+#define PIN_QSPI_DATA1       30
+#define PIN_QSPI_DATA2       31
+#define PIN_QSPI_DATA3       32
 
 // On-board QSPI Flash
 // If EXTERNAL_FLASH_DEVICES is not defined, all supported devices will be used