From 6c073b106994dde6284a38e9afd844d7ebe8c9ef Mon Sep 17 00:00:00 2001 From: Michael Ammann Date: Mon, 28 Nov 2016 12:06:51 +0100 Subject: [PATCH 01/10] Update targets.json This is following steps in https://www.u-blox.com/sites/default/files/NINA-B1_ARMmbedCustomTarget_ApplicationNote_(UBX-16025036).pdf --- targets/targets.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/targets/targets.json b/targets/targets.json index b70bbcc7074..69ccb8aaa2a 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -2332,6 +2332,14 @@ "release_versions": ["2", "5"], "device_name": "nRF52832_xxAA" }, + "UBLOX_EVK_NINA_B1": { + "supported_form_factors": ["ARDUINO"], + "inherits": ["MCU_NRF52"], + "macros_add": ["BOARD_PCA10040", "NRF52_PAN_12", "NRF52_PAN_15", "NRF52_PAN_58", "NRF52_PAN_55", "NRF52_PAN_54", "NRF52_PAN_31", "NRF52_PAN_30", "NRF52_PAN_51", "NRF52_PAN_36", "NRF52_PAN_53", "S132", "CONFIG_GPIO_AS_PINRESET", "BLE_STACK_SUPPORT_REQD", "SWI_DISABLE0", "NRF52_PAN_20", "NRF52_PAN_64", "NRF52_PAN_62", "NRF52_PAN_63"], + "device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"], + "release_versions": ["2", "5"], + "device_name": "nRF52832_xxAA" + }, "DELTA_DFBM_NQ620": { "supported_form_factors": ["ARDUINO"], "inherits": ["MCU_NRF52"], From 693e87f1227305bd80f532957d734d30d79a8976 Mon Sep 17 00:00:00 2001 From: Michael Ammann Date: Mon, 28 Nov 2016 12:11:17 +0100 Subject: [PATCH 02/10] Create device.h --- .../TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/device.h | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/device.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/device.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/device.h new file mode 100644 index 00000000000..74bc43e66c5 --- /dev/null +++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/device.h @@ -0,0 +1,6 @@ +#ifndef MBED_DEVICE_H +#define MBED_DEVICE_H + +#include "objects.h" + +#endif From d48cf96ed01ae5d746b6f6c53d393ba900f499d7 Mon Sep 17 00:00:00 2001 From: Michael Ammann Date: Mon, 28 Nov 2016 12:14:51 +0100 Subject: [PATCH 03/10] Create PinNames.h --- .../TARGET_UBLOX_EVK_NINA_B1/PinNames.h | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/PinNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/PinNames.h new file mode 100644 index 00000000000..f8dbe136fb0 --- /dev/null +++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/PinNames.h @@ -0,0 +1,128 @@ +#ifndef MBED_PINNAMES_H +#define MBED_PINNAMES_H + +#include "cmsis.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum { + PIN_INPUT, + PIN_OUTPUT +} PinDirection; + +#define PORT_SHIFT 3 + +typedef enum { + // nRF52 pin names + p0 = 0, + p1 = 1, + p2 = 2, + p3 = 3, + p4 = 4, + p5 = 5, + p6 = 6, + p7 = 7, + p8 = 8, + p9 = 9, + p10 = 10, + p11 = 11, + p12 = 12, + p13 = 13, + p14 = 14, + p15 = 15, + p16 = 16, + p17 = 17, + p18 = 18, + p19 = 19, + p20 = 20, + p21 = 21, + p22 = 22, + p23 = 23, + p24 = 24, + p25 = 25, + p26 = 26, + p27 = 27, + p28 = 28, + p29 = 29, + p30 = 30, + p31 = 31, + NC = (int)0xFFFFFFFF, // Not connected + + //NINA-B1 module pin names + NINA_B1_GPIO_1 = p8, + NINA_B1_GPIO_2 = p11, + NINA_B1_GPIO_3 = p12, + NINA_B1_GPIO_4 = p13, + NINA_B1_GPIO_5 = p14, + NINA_B1_GPIO_7 = p16, + NINA_B1_GPIO_8 = p18, + + NINA_B1_GPIO_16 = p28, + NINA_B1_GPIO_17 = p29, + NINA_B1_GPIO_18 = p30, + + NINA_B1_GPIO_20 = p31, + NINA_B1_GPIO_21 = p7, + NINA_B1_GPIO_22 = p6, + NINA_B1_GPIO_23 = p5, + NINA_B1_GPIO_24 = p2, + NINA_B1_GPIO_25 = p3, + NINA_B1_GPIO_27 = p4, + NINA_B1_GPIO_28 = p9, + NINA_B1_GPIO_29 = p10, + + // EVK-NINA-B1 board + LED1 = NINA_B1_GPIO_1, // Red + LED2 = NINA_B1_GPIO_7, // Green/SW1 + LED3 = NINA_B1_GPIO_8, // Blue + LED4 = NC, + SW1 = NINA_B1_GPIO_7, + SW2 = NINA_B1_GPIO_18, + D0 = NINA_B1_GPIO_23, + D1 = NINA_B1_GPIO_22, + D2 = NINA_B1_GPIO_21, + D3 = NINA_B1_GPIO_20, + D4 = NINA_B1_GPIO_8, + D5 = NC, // SWDIO + D6 = NINA_B1_GPIO_28, + D7 = NINA_B1_GPIO_29, + D8 = NC, // SWDCLK + D9 = NINA_B1_GPIO_1, + D10 = NINA_B1_GPIO_2, + D11 = NINA_B1_GPIO_4, + D12 = NINA_B1_GPIO_3, + D13 = NINA_B1_GPIO_5, + D14 = NINA_B1_GPIO_24, + D15 = NINA_B1_GPIO_25, + A0 = NINA_B1_GPIO_25, + A1 = NINA_B1_GPIO_24, + A2 = NINA_B1_GPIO_27, + A3 = NINA_B1_GPIO_18, + A4 = NINA_B1_GPIO_17, + A5 = NINA_B1_GPIO_16, + // Nordic SDK pin names + RX_PIN_NUMBER = p5, + TX_PIN_NUMBER = p6, + CTS_PIN_NUMBER = p7, + RTS_PIN_NUMBER = p31, + I2C_SDA0 = p2, + I2C_SCL0 = p3, + // mBed interface pins + USBTX = TX_PIN_NUMBER, + USBRX = RX_PIN_NUMBER +} PinName; + +typedef enum { + PullNone = 0, + PullNone = 0, + PullDown = 1, + PullUp = 3, + PullDefault = PullUp +} PinMode; + +#ifdef __cplusplus +} +#endif +#endif From 0f6661e1229b80120901c22b557e6d719a92e03e Mon Sep 17 00:00:00 2001 From: Michael Ammann Date: Mon, 28 Nov 2016 12:21:08 +0100 Subject: [PATCH 04/10] Create PinNames.h --- .../TARGET_UBLOX_EVK_NINA_B1/PinNames.h | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h new file mode 100644 index 00000000000..f8dbe136fb0 --- /dev/null +++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h @@ -0,0 +1,128 @@ +#ifndef MBED_PINNAMES_H +#define MBED_PINNAMES_H + +#include "cmsis.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum { + PIN_INPUT, + PIN_OUTPUT +} PinDirection; + +#define PORT_SHIFT 3 + +typedef enum { + // nRF52 pin names + p0 = 0, + p1 = 1, + p2 = 2, + p3 = 3, + p4 = 4, + p5 = 5, + p6 = 6, + p7 = 7, + p8 = 8, + p9 = 9, + p10 = 10, + p11 = 11, + p12 = 12, + p13 = 13, + p14 = 14, + p15 = 15, + p16 = 16, + p17 = 17, + p18 = 18, + p19 = 19, + p20 = 20, + p21 = 21, + p22 = 22, + p23 = 23, + p24 = 24, + p25 = 25, + p26 = 26, + p27 = 27, + p28 = 28, + p29 = 29, + p30 = 30, + p31 = 31, + NC = (int)0xFFFFFFFF, // Not connected + + //NINA-B1 module pin names + NINA_B1_GPIO_1 = p8, + NINA_B1_GPIO_2 = p11, + NINA_B1_GPIO_3 = p12, + NINA_B1_GPIO_4 = p13, + NINA_B1_GPIO_5 = p14, + NINA_B1_GPIO_7 = p16, + NINA_B1_GPIO_8 = p18, + + NINA_B1_GPIO_16 = p28, + NINA_B1_GPIO_17 = p29, + NINA_B1_GPIO_18 = p30, + + NINA_B1_GPIO_20 = p31, + NINA_B1_GPIO_21 = p7, + NINA_B1_GPIO_22 = p6, + NINA_B1_GPIO_23 = p5, + NINA_B1_GPIO_24 = p2, + NINA_B1_GPIO_25 = p3, + NINA_B1_GPIO_27 = p4, + NINA_B1_GPIO_28 = p9, + NINA_B1_GPIO_29 = p10, + + // EVK-NINA-B1 board + LED1 = NINA_B1_GPIO_1, // Red + LED2 = NINA_B1_GPIO_7, // Green/SW1 + LED3 = NINA_B1_GPIO_8, // Blue + LED4 = NC, + SW1 = NINA_B1_GPIO_7, + SW2 = NINA_B1_GPIO_18, + D0 = NINA_B1_GPIO_23, + D1 = NINA_B1_GPIO_22, + D2 = NINA_B1_GPIO_21, + D3 = NINA_B1_GPIO_20, + D4 = NINA_B1_GPIO_8, + D5 = NC, // SWDIO + D6 = NINA_B1_GPIO_28, + D7 = NINA_B1_GPIO_29, + D8 = NC, // SWDCLK + D9 = NINA_B1_GPIO_1, + D10 = NINA_B1_GPIO_2, + D11 = NINA_B1_GPIO_4, + D12 = NINA_B1_GPIO_3, + D13 = NINA_B1_GPIO_5, + D14 = NINA_B1_GPIO_24, + D15 = NINA_B1_GPIO_25, + A0 = NINA_B1_GPIO_25, + A1 = NINA_B1_GPIO_24, + A2 = NINA_B1_GPIO_27, + A3 = NINA_B1_GPIO_18, + A4 = NINA_B1_GPIO_17, + A5 = NINA_B1_GPIO_16, + // Nordic SDK pin names + RX_PIN_NUMBER = p5, + TX_PIN_NUMBER = p6, + CTS_PIN_NUMBER = p7, + RTS_PIN_NUMBER = p31, + I2C_SDA0 = p2, + I2C_SCL0 = p3, + // mBed interface pins + USBTX = TX_PIN_NUMBER, + USBRX = RX_PIN_NUMBER +} PinName; + +typedef enum { + PullNone = 0, + PullNone = 0, + PullDown = 1, + PullUp = 3, + PullDefault = PullUp +} PinMode; + +#ifdef __cplusplus +} +#endif +#endif From a1cb4aace715960cb6a5d6b13d1e293955de52a3 Mon Sep 17 00:00:00 2001 From: Michael Ammann Date: Mon, 28 Nov 2016 12:21:27 +0100 Subject: [PATCH 05/10] Create device.h --- .../TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/device.h | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/device.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/device.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/device.h new file mode 100644 index 00000000000..74bc43e66c5 --- /dev/null +++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/device.h @@ -0,0 +1,6 @@ +#ifndef MBED_DEVICE_H +#define MBED_DEVICE_H + +#include "objects.h" + +#endif From d358c9e57c384352518e38328c29ad79aa92bd8a Mon Sep 17 00:00:00 2001 From: Michael Ammann Date: Mon, 28 Nov 2016 12:22:15 +0100 Subject: [PATCH 06/10] Delete device.h --- .../TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/device.h | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/device.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/device.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/device.h deleted file mode 100644 index 74bc43e66c5..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/device.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MBED_DEVICE_H -#define MBED_DEVICE_H - -#include "objects.h" - -#endif From 93fda1444fa5b6affc05e5d714689a0676cebc9a Mon Sep 17 00:00:00 2001 From: Michael Ammann Date: Mon, 28 Nov 2016 12:22:27 +0100 Subject: [PATCH 07/10] Delete PinNames.h --- .../TARGET_UBLOX_EVK_NINA_B1/PinNames.h | 128 ------------------ 1 file changed, 128 deletions(-) delete mode 100644 targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/PinNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/PinNames.h deleted file mode 100644 index f8dbe136fb0..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_UBLOX_EVK_NINA_B1/PinNames.h +++ /dev/null @@ -1,128 +0,0 @@ -#ifndef MBED_PINNAMES_H -#define MBED_PINNAMES_H - -#include "cmsis.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum { - PIN_INPUT, - PIN_OUTPUT -} PinDirection; - -#define PORT_SHIFT 3 - -typedef enum { - // nRF52 pin names - p0 = 0, - p1 = 1, - p2 = 2, - p3 = 3, - p4 = 4, - p5 = 5, - p6 = 6, - p7 = 7, - p8 = 8, - p9 = 9, - p10 = 10, - p11 = 11, - p12 = 12, - p13 = 13, - p14 = 14, - p15 = 15, - p16 = 16, - p17 = 17, - p18 = 18, - p19 = 19, - p20 = 20, - p21 = 21, - p22 = 22, - p23 = 23, - p24 = 24, - p25 = 25, - p26 = 26, - p27 = 27, - p28 = 28, - p29 = 29, - p30 = 30, - p31 = 31, - NC = (int)0xFFFFFFFF, // Not connected - - //NINA-B1 module pin names - NINA_B1_GPIO_1 = p8, - NINA_B1_GPIO_2 = p11, - NINA_B1_GPIO_3 = p12, - NINA_B1_GPIO_4 = p13, - NINA_B1_GPIO_5 = p14, - NINA_B1_GPIO_7 = p16, - NINA_B1_GPIO_8 = p18, - - NINA_B1_GPIO_16 = p28, - NINA_B1_GPIO_17 = p29, - NINA_B1_GPIO_18 = p30, - - NINA_B1_GPIO_20 = p31, - NINA_B1_GPIO_21 = p7, - NINA_B1_GPIO_22 = p6, - NINA_B1_GPIO_23 = p5, - NINA_B1_GPIO_24 = p2, - NINA_B1_GPIO_25 = p3, - NINA_B1_GPIO_27 = p4, - NINA_B1_GPIO_28 = p9, - NINA_B1_GPIO_29 = p10, - - // EVK-NINA-B1 board - LED1 = NINA_B1_GPIO_1, // Red - LED2 = NINA_B1_GPIO_7, // Green/SW1 - LED3 = NINA_B1_GPIO_8, // Blue - LED4 = NC, - SW1 = NINA_B1_GPIO_7, - SW2 = NINA_B1_GPIO_18, - D0 = NINA_B1_GPIO_23, - D1 = NINA_B1_GPIO_22, - D2 = NINA_B1_GPIO_21, - D3 = NINA_B1_GPIO_20, - D4 = NINA_B1_GPIO_8, - D5 = NC, // SWDIO - D6 = NINA_B1_GPIO_28, - D7 = NINA_B1_GPIO_29, - D8 = NC, // SWDCLK - D9 = NINA_B1_GPIO_1, - D10 = NINA_B1_GPIO_2, - D11 = NINA_B1_GPIO_4, - D12 = NINA_B1_GPIO_3, - D13 = NINA_B1_GPIO_5, - D14 = NINA_B1_GPIO_24, - D15 = NINA_B1_GPIO_25, - A0 = NINA_B1_GPIO_25, - A1 = NINA_B1_GPIO_24, - A2 = NINA_B1_GPIO_27, - A3 = NINA_B1_GPIO_18, - A4 = NINA_B1_GPIO_17, - A5 = NINA_B1_GPIO_16, - // Nordic SDK pin names - RX_PIN_NUMBER = p5, - TX_PIN_NUMBER = p6, - CTS_PIN_NUMBER = p7, - RTS_PIN_NUMBER = p31, - I2C_SDA0 = p2, - I2C_SCL0 = p3, - // mBed interface pins - USBTX = TX_PIN_NUMBER, - USBRX = RX_PIN_NUMBER -} PinName; - -typedef enum { - PullNone = 0, - PullNone = 0, - PullDown = 1, - PullUp = 3, - PullDefault = PullUp -} PinMode; - -#ifdef __cplusplus -} -#endif -#endif From 5cede44924766566be1fcc3f005ba63d84e4e214 Mon Sep 17 00:00:00 2001 From: Michael Ammann Date: Mon, 5 Dec 2016 10:22:25 +0100 Subject: [PATCH 08/10] Update PinNames.h --- .../TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h | 1 - 1 file changed, 1 deletion(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h index f8dbe136fb0..c94ae7f9dea 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h @@ -115,7 +115,6 @@ typedef enum { } PinName; typedef enum { - PullNone = 0, PullNone = 0, PullDown = 1, PullUp = 3, From cc9696349614701ae986e7b6f6faab1618be9e94 Mon Sep 17 00:00:00 2001 From: Michael Ammann Date: Mon, 5 Dec 2016 11:39:20 +0100 Subject: [PATCH 09/10] Fix identation --- .../TARGET_UBLOX_EVK_NINA_B1/PinNames.h | 118 +++++++++--------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h index c94ae7f9dea..c3c4e8eccdc 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVK_NINA_B1/PinNames.h @@ -50,68 +50,68 @@ typedef enum { p31 = 31, NC = (int)0xFFFFFFFF, // Not connected - //NINA-B1 module pin names - NINA_B1_GPIO_1 = p8, - NINA_B1_GPIO_2 = p11, - NINA_B1_GPIO_3 = p12, - NINA_B1_GPIO_4 = p13, - NINA_B1_GPIO_5 = p14, - NINA_B1_GPIO_7 = p16, - NINA_B1_GPIO_8 = p18, + //NINA-B1 module pin names + NINA_B1_GPIO_1 = p8, + NINA_B1_GPIO_2 = p11, + NINA_B1_GPIO_3 = p12, + NINA_B1_GPIO_4 = p13, + NINA_B1_GPIO_5 = p14, + NINA_B1_GPIO_7 = p16, + NINA_B1_GPIO_8 = p18, - NINA_B1_GPIO_16 = p28, - NINA_B1_GPIO_17 = p29, - NINA_B1_GPIO_18 = p30, + NINA_B1_GPIO_16 = p28, + NINA_B1_GPIO_17 = p29, + NINA_B1_GPIO_18 = p30, - NINA_B1_GPIO_20 = p31, - NINA_B1_GPIO_21 = p7, - NINA_B1_GPIO_22 = p6, - NINA_B1_GPIO_23 = p5, - NINA_B1_GPIO_24 = p2, - NINA_B1_GPIO_25 = p3, - NINA_B1_GPIO_27 = p4, - NINA_B1_GPIO_28 = p9, - NINA_B1_GPIO_29 = p10, + NINA_B1_GPIO_20 = p31, + NINA_B1_GPIO_21 = p7, + NINA_B1_GPIO_22 = p6, + NINA_B1_GPIO_23 = p5, + NINA_B1_GPIO_24 = p2, + NINA_B1_GPIO_25 = p3, + NINA_B1_GPIO_27 = p4, + NINA_B1_GPIO_28 = p9, + NINA_B1_GPIO_29 = p10, - // EVK-NINA-B1 board - LED1 = NINA_B1_GPIO_1, // Red - LED2 = NINA_B1_GPIO_7, // Green/SW1 - LED3 = NINA_B1_GPIO_8, // Blue - LED4 = NC, - SW1 = NINA_B1_GPIO_7, - SW2 = NINA_B1_GPIO_18, - D0 = NINA_B1_GPIO_23, - D1 = NINA_B1_GPIO_22, - D2 = NINA_B1_GPIO_21, - D3 = NINA_B1_GPIO_20, - D4 = NINA_B1_GPIO_8, - D5 = NC, // SWDIO - D6 = NINA_B1_GPIO_28, - D7 = NINA_B1_GPIO_29, - D8 = NC, // SWDCLK - D9 = NINA_B1_GPIO_1, - D10 = NINA_B1_GPIO_2, - D11 = NINA_B1_GPIO_4, - D12 = NINA_B1_GPIO_3, - D13 = NINA_B1_GPIO_5, - D14 = NINA_B1_GPIO_24, - D15 = NINA_B1_GPIO_25, - A0 = NINA_B1_GPIO_25, - A1 = NINA_B1_GPIO_24, - A2 = NINA_B1_GPIO_27, - A3 = NINA_B1_GPIO_18, - A4 = NINA_B1_GPIO_17, - A5 = NINA_B1_GPIO_16, - // Nordic SDK pin names - RX_PIN_NUMBER = p5, - TX_PIN_NUMBER = p6, - CTS_PIN_NUMBER = p7, - RTS_PIN_NUMBER = p31, - I2C_SDA0 = p2, - I2C_SCL0 = p3, - // mBed interface pins - USBTX = TX_PIN_NUMBER, - USBRX = RX_PIN_NUMBER + // EVK-NINA-B1 board + LED1 = NINA_B1_GPIO_1, // Red + LED2 = NINA_B1_GPIO_7, // Green/SW1 + LED3 = NINA_B1_GPIO_8, // Blue + LED4 = NC, + SW1 = NINA_B1_GPIO_7, + SW2 = NINA_B1_GPIO_18, + D0 = NINA_B1_GPIO_23, + D1 = NINA_B1_GPIO_22, + D2 = NINA_B1_GPIO_21, + D3 = NINA_B1_GPIO_20, + D4 = NINA_B1_GPIO_8, + D5 = NC, // SWDIO + D6 = NINA_B1_GPIO_28, + D7 = NINA_B1_GPIO_29, + D8 = NC, // SWDCLK + D9 = NINA_B1_GPIO_1, + D10 = NINA_B1_GPIO_2, + D11 = NINA_B1_GPIO_4, + D12 = NINA_B1_GPIO_3, + D13 = NINA_B1_GPIO_5, + D14 = NINA_B1_GPIO_24, + D15 = NINA_B1_GPIO_25, + A0 = NINA_B1_GPIO_25, + A1 = NINA_B1_GPIO_24, + A2 = NINA_B1_GPIO_27, + A3 = NINA_B1_GPIO_18, + A4 = NINA_B1_GPIO_17, + A5 = NINA_B1_GPIO_16, + // Nordic SDK pin names + RX_PIN_NUMBER = p5, + TX_PIN_NUMBER = p6, + CTS_PIN_NUMBER = p7, + RTS_PIN_NUMBER = p31, + I2C_SDA0 = p2, + I2C_SCL0 = p3, + // mBed interface pins + USBTX = TX_PIN_NUMBER, + USBRX = RX_PIN_NUMBER } PinName; typedef enum { From 9b37b6f987564390a64f71af35fbc3eaa26b7cce Mon Sep 17 00:00:00 2001 From: Michael Ammann Date: Mon, 5 Dec 2016 16:16:46 +0100 Subject: [PATCH 10/10] Moved target code to avoid merge conflict. --- targets/targets.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/targets/targets.json b/targets/targets.json index 69ccb8aaa2a..e1c10cacf14 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -2332,19 +2332,19 @@ "release_versions": ["2", "5"], "device_name": "nRF52832_xxAA" }, - "UBLOX_EVK_NINA_B1": { + "DELTA_DFBM_NQ620": { "supported_form_factors": ["ARDUINO"], "inherits": ["MCU_NRF52"], "macros_add": ["BOARD_PCA10040", "NRF52_PAN_12", "NRF52_PAN_15", "NRF52_PAN_58", "NRF52_PAN_55", "NRF52_PAN_54", "NRF52_PAN_31", "NRF52_PAN_30", "NRF52_PAN_51", "NRF52_PAN_36", "NRF52_PAN_53", "S132", "CONFIG_GPIO_AS_PINRESET", "BLE_STACK_SUPPORT_REQD", "SWI_DISABLE0", "NRF52_PAN_20", "NRF52_PAN_64", "NRF52_PAN_62", "NRF52_PAN_63"], - "device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"], + "device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"], "release_versions": ["2", "5"], "device_name": "nRF52832_xxAA" }, - "DELTA_DFBM_NQ620": { + "UBLOX_EVK_NINA_B1": { "supported_form_factors": ["ARDUINO"], "inherits": ["MCU_NRF52"], "macros_add": ["BOARD_PCA10040", "NRF52_PAN_12", "NRF52_PAN_15", "NRF52_PAN_58", "NRF52_PAN_55", "NRF52_PAN_54", "NRF52_PAN_31", "NRF52_PAN_30", "NRF52_PAN_51", "NRF52_PAN_36", "NRF52_PAN_53", "S132", "CONFIG_GPIO_AS_PINRESET", "BLE_STACK_SUPPORT_REQD", "SWI_DISABLE0", "NRF52_PAN_20", "NRF52_PAN_64", "NRF52_PAN_62", "NRF52_PAN_63"], - "device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"], + "device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"], "release_versions": ["2", "5"], "device_name": "nRF52832_xxAA" },