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

nrf5/bluetooth: Moving makefile include folder and source files of bluetooth driver, ble uart and ble module to main Makefile.

This commit is contained in:
Glenn Ruben Bakke 2017-05-11 18:34:12 +02:00 committed by glennrub
parent d61dcf18fb
commit 4676e5900b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nrf5/Makefile
View File

@ -54,7 +54,9 @@ INC += -I./hal
INC += -I./hal/$(MCU_VARIANT) INC += -I./hal/$(MCU_VARIANT)
INC += -I./modules/machine INC += -I./modules/machine
INC += -I./modules/ubluepy INC += -I./modules/ubluepy
INC += -I./modules/ble
INC += -I../lib/mp-readline INC += -I../lib/mp-readline
INC += -I./bluetooth
NRF_DEFINES += -D$(MCU_VARIANT_UPPER) NRF_DEFINES += -D$(MCU_VARIANT_UPPER)
NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET
@ -127,6 +129,8 @@ SRC_C += \
pin_named_pins.c \ pin_named_pins.c \
fatfs_port.c \ fatfs_port.c \
drivers/pwm.c \ drivers/pwm.c \
bluetooth/ble_drv.c \
bluetooth/ble_uart.c \
DRIVERS_SRC_C += $(addprefix modules/,\ DRIVERS_SRC_C += $(addprefix modules/,\
machine/modmachine.c \ machine/modmachine.c \
@ -155,6 +159,7 @@ DRIVERS_SRC_C += $(addprefix modules/,\
ubluepy/ubluepy_scan_entry.c \ ubluepy/ubluepy_scan_entry.c \
music/modmusic.c \ music/modmusic.c \
music/musictunes.c \ music/musictunes.c \
ble/modble.c \
) )
#ifeq ($(SD), ) #ifeq ($(SD), )

7
nrf5/bluetooth/bluetooth_common.mk
View File

@ -53,10 +53,3 @@ SOFTDEV_HEX = $(SOFTDEV_HEX_PATH)/$(SOFTDEV_HEX_NAME)
ifeq ($(shell test ! -e $(SOFTDEV_HEX) && echo -n no),no) ifeq ($(shell test ! -e $(SOFTDEV_HEX) && echo -n no),no)
$(error $(STACK_MISSING_ERROR)) $(error $(STACK_MISSING_ERROR))
endif endif
INC += -I./bluetooth
SRC_C += \
bluetooth/modble.c \
bluetooth/ble_drv.c \
bluetooth/ble_uart.c