From 02862cbc6614901291961a3c71fec3dcff7754a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bora=20=C3=96zgen?= Date: Tue, 27 Jul 2021 16:01:21 +0200 Subject: [PATCH 1/2] nRF52840-DK: Migrate to Arduino Uno pin names --- .../TARGET_NRF52840_DK/PinNames.h | 46 +++++++++---------- targets/targets.json | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_NRF52840_DK/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_NRF52840_DK/PinNames.h index 97049436433..76470ae31fa 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_NRF52840_DK/PinNames.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_NRF52840_DK/PinNames.h @@ -209,31 +209,31 @@ typedef enum { I2C_SDA0 = p26, I2C_SCL0 = p27, - D0 = P1_1, - D1 = P1_2, - D2 = P1_3, - D3 = P1_4, - D4 = P1_5, - D5 = P1_6, - D6 = P1_7, - D7 = P1_8, + // Arduino Uno pins + ARDUINO_UNO_D0 = P1_1, + ARDUINO_UNO_D1 = P1_2, + ARDUINO_UNO_D2 = P1_3, + ARDUINO_UNO_D3 = P1_4, + ARDUINO_UNO_D4 = P1_5, + ARDUINO_UNO_D5 = P1_6, + ARDUINO_UNO_D6 = P1_7, + ARDUINO_UNO_D7 = P1_8, - D8 = P1_10, - D9 = P1_11, - D10 = P1_12, - D11 = P1_13, - D12 = P1_14, - D13 = P1_15, + ARDUINO_UNO_D8 = P1_10, + ARDUINO_UNO_D9 = P1_11, + ARDUINO_UNO_D10 = P1_12, + ARDUINO_UNO_D11 = P1_13, + ARDUINO_UNO_D12 = P1_14, + ARDUINO_UNO_D13 = P1_15, + ARDUINO_UNO_D14 = p26, + ARDUINO_UNO_D15 = p27, - D14 = p26, - D15 = p27, - - A0 = p3, - A1 = p4, - A2 = p28, - A3 = p29, - A4 = p30, - A5 = p31, + ARDUINO_UNO_A0 = p3, + ARDUINO_UNO_A1 = p4, + ARDUINO_UNO_A2 = p28, + ARDUINO_UNO_A3 = p29, + ARDUINO_UNO_A4 = p30, + ARDUINO_UNO_A5 = p31, /**** QSPI pins ****/ QSPI1_IO0 = P0_20, diff --git a/targets/targets.json b/targets/targets.json index 55d9c35a592..8381ab02f0b 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -6234,7 +6234,7 @@ }, "NRF52840_DK": { "supported_form_factors": [ - "ARDUINO" + "ARDUINO_UNO" ], "inherits": [ "MCU_NRF52840" From c77c85c2bcfa558e6aff7252bf552da16d781b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bora=20=C3=96zgen?= Date: Tue, 5 Oct 2021 08:58:27 +0200 Subject: [PATCH 2/2] nRF52840-DK: Fix pin validation Adapted the file to the latest pin naming guidelines. pinvalidate.py passes. --- .../TARGET_NRF52840_DK/PinNames.h | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_NRF52840_DK/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_NRF52840_DK/PinNames.h index 76470ae31fa..e12636ee41a 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_NRF52840_DK/PinNames.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_NRF52840_DK/PinNames.h @@ -57,7 +57,7 @@ typedef enum { #define PinDef(port_num, pin_num) P##port_num##_##pin_num = NRF_GPIO_PIN_MAP(port_num, pin_num) -typedef enum { +typedef enum { PinDef(0 , 0), // P0_0 = 0... PinDef(0 , 1), PinDef(0 , 2), @@ -159,16 +159,6 @@ typedef enum { p45 = P1_13, p46 = P1_14, p47 = P1_15, - - LED1 = p13, - LED2 = p14, - LED3 = p15, - LED4 = p16, - - BUTTON1 = p11, - BUTTON2 = p12, - BUTTON3 = p24, - BUTTON4 = p25, RX_PIN_NUMBER = p8, TX_PIN_NUMBER = p6, @@ -191,24 +181,6 @@ typedef enum { STDIO_UART_CTS = CTS_PIN_NUMBER, STDIO_UART_RTS = RTS_PIN_NUMBER, - SPI_PSELMOSI0 = P1_13, - SPI_PSELMISO0 = P1_14, - SPI_PSELSS0 = P1_12, - SPI_PSELSCK0 = P1_15, - - SPI_PSELMOSI1 = P1_2, - SPI_PSELMISO1 = P1_3, - SPI_PSELSS1 = P1_1, - SPI_PSELSCK1 = P1_4, - - SPIS_PSELMOSI = P1_2, - SPIS_PSELMISO = P1_3, - SPIS_PSELSS = P1_1, - SPIS_PSELSCK = P1_4, - - I2C_SDA0 = p26, - I2C_SCL0 = p27, - // Arduino Uno pins ARDUINO_UNO_D0 = P1_1, ARDUINO_UNO_D1 = P1_2, @@ -262,6 +234,34 @@ typedef enum { PullDefault = PullUp } PinMode; +#define LED1 p13 +#define LED2 p14 +#define LED3 p15 +#define LED4 p16 + +#define BUTTON1 p11 +#define BUTTON2 p12 +#define BUTTON3 p24 +#define BUTTON4 p25 + +#define SPI_PSELMOSI0 P1_13 +#define SPI_PSELMISO0 P1_14 +#define SPI_PSELSS0 P1_12 +#define SPI_PSELSCK0 P1_15 + +#define SPI_PSELMOSI1 P1_2 +#define SPI_PSELMISO1 P1_3 +#define SPI_PSELSS1 P1_1 +#define SPI_PSELSCK1 P1_4 + +#define SPIS_PSELMOSI P1_2 +#define SPIS_PSELMISO P1_3 +#define SPIS_PSELSS P1_1 +#define SPIS_PSELSCK P1_4 + +#define I2C_SDA0 p26 +#define I2C_SCL0 p27 + #ifdef __cplusplus } #endif