From 96b203b729e8efefafa1ff8ef33b6f10093fdd44 Mon Sep 17 00:00:00 2001 From: Glenn Ruben Bakke Date: Thu, 11 May 2017 18:53:53 +0200 Subject: [PATCH] nrf5/bluetooth: Updating makefiles with updated paths to bluetooth le components after moving files. --- nrf5/Makefile | 8 ++++---- nrf5/drivers/bluetooth/bluetooth_common.mk | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nrf5/Makefile b/nrf5/Makefile index 6d6f043635..493beacae8 100644 --- a/nrf5/Makefile +++ b/nrf5/Makefile @@ -23,7 +23,7 @@ else include ../py/mkenv.mk include boards/$(BOARD)/mpconfigboard_$(SD_LOWER).mk - include bluetooth/bluetooth_common.mk + include drivers/bluetooth/bluetooth_common.mk endif # qstr definitions (must come before including py.mk) @@ -56,7 +56,7 @@ INC += -I./modules/machine INC += -I./modules/ubluepy INC += -I./modules/ble INC += -I../lib/mp-readline -INC += -I./bluetooth +INC += -I./drivers/bluetooth NRF_DEFINES += -D$(MCU_VARIANT_UPPER) NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET @@ -129,8 +129,8 @@ SRC_C += \ pin_named_pins.c \ fatfs_port.c \ drivers/pwm.c \ - bluetooth/ble_drv.c \ - bluetooth/ble_uart.c \ + drivers/bluetooth/ble_drv.c \ + drivers/bluetooth/ble_uart.c \ DRIVERS_SRC_C += $(addprefix modules/,\ machine/modmachine.c \ diff --git a/nrf5/drivers/bluetooth/bluetooth_common.mk b/nrf5/drivers/bluetooth/bluetooth_common.mk index 84999efef6..38c604e04c 100644 --- a/nrf5/drivers/bluetooth/bluetooth_common.mk +++ b/nrf5/drivers/bluetooth/bluetooth_common.mk @@ -3,19 +3,19 @@ SOFTDEV_HEX_NAME ?= SOFTDEV_HEX_PATH ?= ifeq ($(SD), s110) - INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include + INC += -Idrivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include CFLAGS += -DBLUETOOTH_SD_DEBUG=1 CFLAGS += -DBLUETOOTH_SD=110 SOFTDEV_HEX_NAME = $(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_softdevice.hex - SOFTDEV_HEX_PATH = bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION) + SOFTDEV_HEX_PATH = drivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION) else ifeq ($(SD), s120) $(error No BLE wrapper available yet) else ifeq ($(SD), s130) $(error No BLE wrapper available yet) else ifeq ($(SD), s132) - 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 += -Idrivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include + INC += -Idrivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT) CFLAGS += -DBLUETOOTH_SD_DEBUG=1 CFLAGS += -DBLUETOOTH_SD=132 @@ -26,7 +26,7 @@ else ifeq ($(SOFTDEV_VERSION), 3.0.0) endif SOFTDEV_HEX_NAME = $(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_softdevice.hex - SOFTDEV_HEX_PATH = bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION) + SOFTDEV_HEX_PATH = drivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION) else $(error Incorrect softdevice set flag) endif @@ -41,7 +41,7 @@ define STACK_MISSING_ERROR # # # Please run the download script: # # # -# bluetooth/download_ble_stack.sh # +# drivers/bluetooth/download_ble_stack.sh # # # #######################################################