Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions extmod/extmod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -545,9 +545,11 @@ endif

ifneq ($(MICROPY_BLUETOOTH_NIMBLE),1)
ifneq ($(MICROPY_BLUETOOTH_BTSTACK),1)
ifneq ($(MICROPY_BLUETOOTH_PORT_BTSTACK),1)
$(error Must enable one of MICROPY_BLUETOOTH_NIMBLE or MICROPY_BLUETOOTH_BTSTACK)
endif
endif
endif

ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
include $(TOP)/extmod/nimble/nimble.mk
Expand Down
2 changes: 1 addition & 1 deletion lib/mtb-psoc6-libs
10 changes: 6 additions & 4 deletions ports/psoc6/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ ifeq ($(MICROPY_PY_SD_CARD),1)
MOD_SRC_C += machine_sdcard.c
endif

ifeq ($(MICROPY_PSOC6_BLUETOOTH),1)
CFLAGS += -DMICROPY_PSOC6_BLUETOOTH=1
MOD_SRC_C += modbluetooth.c
ifeq ($(MICROPY_PY_BLUETOOTH),1)
CFLAGS += -DMICROPY_PY_BLUETOOTH=1
MOD_SRC_C += modbluetooth.c
endif

ifeq ($(MICROPY_PY_NETWORK_IFX_WCM),1)
Expand All @@ -187,7 +187,8 @@ SRC_C = help.c \
main.c \
mphalport.c \
frozen_content.c \
pins_$(BOARD).c
pins_$(BOARD).c \


SRC_ASM += shared/runtime/gchelper_thumb1.s

Expand Down Expand Up @@ -227,6 +228,7 @@ $(BUILD)/firmware.hex: $(BUILD)/firmware.elf

MPY_CROSS_FLAGS += -march=armv7m


build: mtb_get_build_flags $(GENERATED_PINS) $(BUILD)/firmware.hex

all: build
Expand Down
25 changes: 0 additions & 25 deletions ports/psoc6/ble/cycfg_bt.timestamp

This file was deleted.

243 changes: 0 additions & 243 deletions ports/psoc6/ble/cycfg_bt_settings.c

This file was deleted.

38 changes: 0 additions & 38 deletions ports/psoc6/ble/cycfg_bt_settings.h

This file was deleted.

58 changes: 0 additions & 58 deletions ports/psoc6/ble/cycfg_gap.c

This file was deleted.

142 changes: 0 additions & 142 deletions ports/psoc6/ble/cycfg_gap.h

This file was deleted.

Loading
Loading