Skip to content

Commit 4bee653

Browse files
author
JoeBakalor
committed
updates to bluebird
1 parent dde7c5e commit 4bee653

File tree

6 files changed

+39
-79
lines changed

6 files changed

+39
-79
lines changed

‎ports/nrf/boards/pca10056/mpconfigboard.h

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,42 +24,40 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#include "nrfx/hal/nrf_gpio.h"
28-
29-
#define MICROPY_HW_BOARD_NAME "PCA10056 nRF52840-DK"
30-
#define MICROPY_HW_MCU_NAME "nRF52840"
31-
32-
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
33-
34-
#define MICROPY_HW_LED_STATUS (&pin_P0_13)
35-
36-
#define DEFAULT_I2C_BUS_SCL (&pin_P0_27)
37-
#define DEFAULT_I2C_BUS_SDA (&pin_P0_26)
38-
39-
#define DEFAULT_SPI_BUS_SCK (&pin_P1_15)
40-
#define DEFAULT_SPI_BUS_MOSI (&pin_P1_13)
41-
#define DEFAULT_SPI_BUS_MISO (&pin_P1_14)
42-
43-
#define DEFAULT_UART_BUS_RX (&pin_P1_01)
44-
#define DEFAULT_UART_BUS_TX (&pin_P1_02)
45-
46-
// Flash operation mode is determined by MICROPY_QSPI_DATAn pin configuration.
47-
// A pin config is valid if it is defined and its value is not 0xFF.
48-
// Quad mode: If all DATA0 --> DATA3 are valid
49-
// Dual mode: If DATA0 and DATA1 are valid while either DATA2 and/or DATA3 are invalid
50-
// Single mode: If only DATA0 is valid
51-
#if QSPI_FLASH_FILESYSTEM
52-
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 20)
53-
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 21)
54-
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 22)
55-
#define MICROPY_QSPI_DATA3 NRF_GPIO_PIN_MAP(0, 23)
56-
#define MICROPY_QSPI_SCK NRF_GPIO_PIN_MAP(0, 19)
57-
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 17)
58-
#endif
59-
60-
#if SPI_FLASH_FILESYSTEM
61-
#define SPI_FLASH_MOSI_PIN &pin_P0_20
62-
#define SPI_FLASH_MISO_PIN &pin_P0_21
63-
#define SPI_FLASH_SCK_PIN &pin_P0_19
64-
#define SPI_FLASH_CS_PIN &pin_P0_17
65-
#endif
27+
#include "nrfx/hal/nrf_gpio.h"
28+
29+
#define MICROPY_HW_BOARD_NAME "PCA10056 nRF52840-DK"
30+
#define MICROPY_HW_MCU_NAME "nRF52840"
31+
32+
#define MICROPY_HW_LED_STATUS (&pin_P0_13)
33+
34+
#define DEFAULT_I2C_BUS_SCL (&pin_P0_27)
35+
#define DEFAULT_I2C_BUS_SDA (&pin_P0_26)
36+
37+
#define DEFAULT_SPI_BUS_SCK (&pin_P1_15)
38+
#define DEFAULT_SPI_BUS_MOSI (&pin_P1_13)
39+
#define DEFAULT_SPI_BUS_MISO (&pin_P1_14)
40+
41+
#define DEFAULT_UART_BUS_RX (&pin_P1_01)
42+
#define DEFAULT_UART_BUS_TX (&pin_P1_02)
43+
44+
// Flash operation mode is determined by MICROPY_QSPI_DATAn pin configuration.
45+
// A pin config is valid if it is defined and its value is not 0xFF.
46+
// Quad mode: If all DATA0 --> DATA3 are valid
47+
// Dual mode: If DATA0 and DATA1 are valid while either DATA2 and/or DATA3 are invalid
48+
// Single mode: If only DATA0 is valid
49+
#if QSPI_FLASH_FILESYSTEM
50+
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 20)
51+
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 21)
52+
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 22)
53+
#define MICROPY_QSPI_DATA3 NRF_GPIO_PIN_MAP(0, 23)
54+
#define MICROPY_QSPI_SCK NRF_GPIO_PIN_MAP(0, 19)
55+
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 17)
56+
#endif
57+
58+
#if SPI_FLASH_FILESYSTEM
59+
#define SPI_FLASH_MOSI_PIN &pin_P0_20
60+
#define SPI_FLASH_MISO_PIN &pin_P0_21
61+
#define SPI_FLASH_SCK_PIN &pin_P0_19
62+
#define SPI_FLASH_CS_PIN &pin_P0_17
63+
#endif

‎ports/nrf/boards/pca10056/mpconfigboard.mk

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,7 @@ USB_PID = 0x802A
33
USB_PRODUCT = "PCA10056"
44
USB_MANUFACTURER = "Nordic Semiconductor"
55

6-
MCU_SERIES = m4
7-
MCU_VARIANT = nrf52
8-
MCU_SUB_VARIANT = nrf52840
96
MCU_CHIP = nrf52840
10-
SD ?= s140
11-
SOFTDEV_VERSION ?= 6.1.0
12-
13-
BOOT_SETTING_ADDR = 0xFF000
14-
15-
ifeq ($(SD),)
16-
LD_FILE = boards/nrf52840_1M_256k.ld
17-
else
18-
LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld
19-
CIRCUITPY_BLEIO = 1
20-
endif
21-
22-
NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
237

248
QSPI_FLASH_FILESYSTEM = 1
259
EXTERNAL_FLASH_DEVICE_COUNT = 1

‎ports/nrf/boards/pca10059/mpconfigboard.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,3 @@
2828
#define MICROPY_HW_MCU_NAME "nRF52840"
2929

3030
#define MICROPY_HW_LED_STATUS (&pin_P0_06)
31-
32-
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500

‎ports/nrf/boards/pca10059/mpconfigboard.mk

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,6 @@ USB_PID = 0x802A
33
USB_PRODUCT = "PCA10059"
44
USB_MANUFACTURER = "Nordic Semiconductor"
55

6-
MCU_SERIES = m4
7-
MCU_VARIANT = nrf52
8-
MCU_SUB_VARIANT = nrf52840
96
MCU_CHIP = nrf52840
10-
SD ?= s140
11-
SOFTDEV_VERSION ?= 6.1.0
127

13-
BOOT_SETTING_ADDR = 0xFF000
14-
BOOT_FILE = boards/$(BOARD)/bootloader/$(SOFTDEV_VERSION)/$(BOARD)_bootloader_$(SOFTDEV_VERSION)_s140
15-
16-
ifeq ($(SD),)
17-
LD_FILE = boards/nrf52840_1M_256k.ld
18-
else
19-
LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld
20-
CIRCUITPY_BLEIO = 1
21-
endif
22-
23-
NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
8+
INTERNAL_FLASH_FILESYSTEM = 1

‎ports/nrf/boards/teknikio_bluebird/mpconfigboard.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
#define MICROPY_HW_BOARD_NAME "Teknikio Bluebird"
3434
#define MICROPY_HW_MCU_NAME "nRF52840"
3535

36-
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
37-
3836
#define MICROPY_HW_NEOPIXEL (&pin_P0_26)
3937

4038
#define DEFAULT_I2C_BUS_SCL (&pin_P0_27)
@@ -47,4 +45,4 @@
4745
#define DEFAULT_UART_BUS_RX (&pin_P1_07)
4846
#define DEFAULT_UART_BUS_TX (&pin_P1_08)
4947

50-
#define BOARD_HAS_CRYSTAL 1 // according to the schematic we do
48+
#define BOARD_HAS_CRYSTAL 1 // according to the schematic we do

‎ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,3 @@ else
2020
endif
2121

2222
NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
23-
24-
INTERNAL_FLASH_FILESYSTEM = 1
25-

0 commit comments

Comments
 (0)