Skip to content

Commit 82b49af

Browse files
dhalbertdhalbert
committed
enable CIRCUITPY_BLEIO_HCI on non-nRF boards where it will fit
1 parent f1e8f2b commit 82b49af

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

‎ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
66
CHIP_VARIANT = SAMD51J19A
77
CHIP_FAMILY = samd51
88

9-
# Support _bleio via the on-board ESP32 module.
10-
CIRCUITPY_BLEIO = 1
11-
CIRCUITPY_BLEIO_HCI = 1
12-
139
QSPI_FLASH_FILESYSTEM = 1
1410
EXTERNAL_FLASH_DEVICE_COUNT = 3
1511
EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"

‎ports/atmel-samd/mpconfigport.mk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ ifndef CIRCUITPY_TOUCHIO_USE_NATIVE
3737
CIRCUITPY_TOUCHIO_USE_NATIVE = 1
3838
endif
3939

40+
# No room for HCI _bleio on SAMD21.
41+
CIRCUITPY_BLEIO_HCI = 0
42+
4043
CIRCUITPY_SDCARDIO ?= 0
4144

4245
# Not enough RAM for framebuffers

‎ports/nrf/mpconfigport.mk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ CIRCUITPY_AUDIOCORE ?= 1
2323
CIRCUITPY_AUDIOMIXER ?= 1
2424
CIRCUITPY_AUDIOPWMIO ?= 1
2525

26+
# Native BLEIO is not compatible with HCI _bleio.
27+
CIRCUITPY_BLEIO_HCI = 0
28+
2629
CIRCUITPY_BLEIO ?= 1
2730

2831
# No I2CPeripheral implementation

‎py/circuitpy_mpconfig.mk‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ CFLAGS += -DCIRCUITPY_AUDIOMP3=$(CIRCUITPY_AUDIOMP3)
7979
CIRCUITPY_BITBANGIO ?= $(CIRCUITPY_FULL_BUILD)
8080
CFLAGS += -DCIRCUITPY_BITBANGIO=$(CIRCUITPY_BITBANGIO)
8181

82-
# Explicitly enabled for boards that support _bleio.
83-
CIRCUITPY_BLEIO ?= 0
84-
CFLAGS += -DCIRCUITPY_BLEIO=$(CIRCUITPY_BLEIO)
85-
8682
# _bleio can be supported on most any board via HCI
87-
CIRCUITPY_BLEIO_HCI ?= 0
83+
CIRCUITPY_BLEIO_HCI ?= $(CIRCUITPY_FULL_BUILD)
8884
CFLAGS += -DCIRCUITPY_BLEIO_HCI=$(CIRCUITPY_BLEIO_HCI)
8985

86+
# Explicitly enabled for boards that support _bleio.
87+
CIRCUITPY_BLEIO ?= $(CIRCUITPY_BLEIO_HCI)
88+
CFLAGS += -DCIRCUITPY_BLEIO=$(CIRCUITPY_BLEIO)
89+
9090
CIRCUITPY_BOARD ?= 1
9191
CFLAGS += -DCIRCUITPY_BOARD=$(CIRCUITPY_BOARD)
9292

0 commit comments

Comments
 (0)