From 283bf080d2e5b811af1e5379c9dc6be30c763103 Mon Sep 17 00:00:00 2001 From: Beetix Date: Wed, 7 Nov 2018 15:18:30 +0100 Subject: [PATCH] Fixed unavailable GPIOs issue - GPIO0 and GPIO1 on the DWM1001 are attached to the DW1000 not the nRF52 - Removed 2 digital pins - Shifted all the numbering --- variants/DWM1001-DEV/variant.cpp | 4 +-- variants/DWM1001-DEV/variant.h | 44 ++++++++++++++++---------------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/variants/DWM1001-DEV/variant.cpp b/variants/DWM1001-DEV/variant.cpp index fd874c7f..c5790a28 100644 --- a/variants/DWM1001-DEV/variant.cpp +++ b/variants/DWM1001-DEV/variant.cpp @@ -20,9 +20,7 @@ #include "variant.h" const uint32_t g_ADigitalPinMap[] = { - // D0 - D10 - 1, - 0, + // D0 - D8 12, 27, 23, diff --git a/variants/DWM1001-DEV/variant.h b/variants/DWM1001-DEV/variant.h index 71db22d7..78a8d3d1 100644 --- a/variants/DWM1001-DEV/variant.h +++ b/variants/DWM1001-DEV/variant.h @@ -32,16 +32,16 @@ extern "C" #endif // __cplusplus // Number of pins defined in PinDescription array -#define PINS_COUNT (29u) -#define NUM_DIGITAL_PINS (13u) +#define PINS_COUNT (27u) +#define NUM_DIGITAL_PINS (11u) #define NUM_ANALOG_INPUTS (2u) #define NUM_ANALOG_OUTPUTS (0u) // LEDs -#define PIN_LEDRT (24) -#define PIN_LEDRB (25) -#define PIN_LEDG (26) -#define PIN_LEDB (27) +#define PIN_LEDRT (22) +#define PIN_LEDRB (23) +#define PIN_LEDG (24) +#define PIN_LEDB (25) #define LED_BUILTIN PIN_LEDRT static const uint8_t LED_RED_TOP = PIN_LEDRT ; static const uint8_t LED_RED_BOT = PIN_LEDRB ; @@ -49,15 +49,15 @@ static const uint8_t LED_GREEN = PIN_LEDG ; static const uint8_t LED_BLUE = PIN_LEDB ; // Button -#define PIN_BUTTON (28) +#define PIN_BUTTON (26) static const uint8_t BTN = PIN_BUTTON ; /* * Analog pins */ -#define PIN_A0 (11) -#define PIN_A1 (15) +#define PIN_A0 (9) +#define PIN_A1 (10) static const uint8_t A0 = PIN_A0 ; // AIN2 static const uint8_t A1 = PIN_A1 ; // AIN1 @@ -67,16 +67,16 @@ static const uint8_t A1 = PIN_A1 ; // AIN1 * Serial interfaces */ // Serial -#define PIN_SERIAL_RX (15) -#define PIN_SERIAL_TX (16) +#define PIN_SERIAL_RX (13) +#define PIN_SERIAL_TX (14) /* * SPI Interfaces */ #define SPI_INTERFACES_COUNT 2 -#define PIN_SPI_MISO (10) -#define PIN_SPI_MOSI (9) +#define PIN_SPI_MISO (8) +#define PIN_SPI_MOSI (7) #define PIN_SPI_SCK (PIN_A0) static const uint8_t SS = PIN_A1 ; @@ -84,10 +84,10 @@ static const uint8_t MOSI = PIN_SPI_MOSI ; static const uint8_t MISO = PIN_SPI_MISO ; static const uint8_t SCK = PIN_SPI_SCK ; -#define PIN_SPI1_SS (17) -#define PIN_SPI1_MISO (18) -#define PIN_SPI1_MOSI (19) -#define PIN_SPI1_SCK (20) +#define PIN_SPI1_SS (15) +#define PIN_SPI1_MISO (16) +#define PIN_SPI1_MOSI (17) +#define PIN_SPI1_SCK (18) static const uint8_t SS1 = PIN_SPI1_SS ; static const uint8_t MOSI1 = PIN_SPI1_MOSI ; @@ -99,8 +99,8 @@ static const uint8_t SCK1 = PIN_SPI1_SCK ; */ #define WIRE_INTERFACES_COUNT 1 -#define PIN_WIRE_SDA (13) -#define PIN_WIRE_SCL (14) +#define PIN_WIRE_SDA (11) +#define PIN_WIRE_SCL (12) static const uint8_t SDA = PIN_WIRE_SDA; static const uint8_t SCL = PIN_WIRE_SCL; @@ -113,13 +113,13 @@ static const uint8_t SCL = PIN_WIRE_SCL; /* * Other DWM1001 internal IOs */ -#define PIN_DW_RST (21) -#define PIN_DW_IRQ (22) +#define PIN_DW_RST (19) +#define PIN_DW_IRQ (20) static const uint8_t DW_RST = PIN_DW_RST; static const uint8_t DW_IRQ = PIN_DW_IRQ; -#define PIN_ACC_IRQ (23) +#define PIN_ACC_IRQ (21) static const uint8_t ACC_IRQ = PIN_ACC_IRQ;