djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf5/bluetooth: Remove hardcoded softdevice version as this now comes as parameter from board makefile.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-04-24 22:29:48 +02:00
parent 3c8323aff4
commit 9abd38a3f2
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nrf5/bluetooth/bluetooth_common.mk
View File

@ -3,7 +3,6 @@ SOFTDEV_HEX_NAME ?=
SOFTDEV_HEX_PATH ?= SOFTDEV_HEX_PATH ?=
ifeq ($(SD), s110) ifeq ($(SD), s110)
SOFTDEV_VERSION = 8.0.0
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include
CFLAGS += -DBLUETOOTH_SD_DEBUG=1 CFLAGS += -DBLUETOOTH_SD_DEBUG=1
CFLAGS += -DBLUETOOTH_SD=110 CFLAGS += -DBLUETOOTH_SD=110
@ -15,7 +14,6 @@ else ifeq ($(SD), s120)
else ifeq ($(SD), s130) else ifeq ($(SD), s130)
$(error No BLE wrapper available yet) $(error No BLE wrapper available yet)
else ifeq ($(SD), s132) else ifeq ($(SD), s132)
SOFTDEV_VERSION=3.0.0
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT) INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT)
CFLAGS += -DBLUETOOTH_SD_DEBUG=1 CFLAGS += -DBLUETOOTH_SD_DEBUG=1