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

nrf: Move bluetooth driver to the 'bluetooth' folder

This commit is contained in:
arturo182 2018-07-22 16:23:04 +02:00
parent 17f13ecc2c
commit d5a71a4b8a
11 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/nrf/.gitignore vendored
View File

@ -1,6 +1,6 @@
# Nordic files
#####################
drivers/bluetooth/s1*/
bluetooth/s1*/
# Build files
#####################

6
ports/nrf/Makefile
View File

@ -21,7 +21,7 @@ include ../../py/mkenv.mk
-include mpconfigport.mk
ifneq ($(SD), )
include drivers/bluetooth/bluetooth_common.mk
include bluetooth/bluetooth_common.mk
endif
FROZEN_MPY_DIR = freeze
@ -41,6 +41,7 @@ INC += -I$(BUILD)
INC += -I$(BUILD)/genhdr
INC += -I./../../lib/cmsis/inc
INC += -I./boards/$(BOARD)
INC += -I./bluetooth
INC += -I./modules/ubluepy
INC += -I./modules/ble
INC += -I./nrfx
@ -48,9 +49,6 @@ INC += -I./nrfx/hal
INC += -I./nrfx/mdk
INC += -I./nrfx/drivers/include
INC += -I../../lib/mp-readline
INC += -I./drivers/bluetooth
INC += -I./drivers
INC += -I./peripherals
INC += -I../../lib/tinyusb/src
INC += -I./usb

0
ports/nrf/drivers/bluetooth/ble_drv.c → ports/nrf/bluetooth/ble_drv.c
View File

0
ports/nrf/drivers/bluetooth/ble_drv.h → ports/nrf/bluetooth/ble_drv.h
View File

0
ports/nrf/drivers/bluetooth/ble_uart.c → ports/nrf/bluetooth/ble_uart.c
View File

0
ports/nrf/drivers/bluetooth/ble_uart.h → ports/nrf/bluetooth/ble_uart.h
View File

8
ports/nrf/drivers/bluetooth/bluetooth_common.mk → ports/nrf/bluetooth/bluetooth_common.mk
View File

@ -15,11 +15,11 @@ endif
CFLAGS += -DBLUETOOTH_SD_DEBUG=1
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)
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)
SOFTDEV_HEX_NAME = $(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_softdevice.hex
SOFTDEV_HEX_PATH = drivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)
SOFTDEV_HEX_PATH = bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)
SOFTDEV_HEX = $(SOFTDEV_HEX_PATH)/$(SOFTDEV_HEX_NAME)
define STACK_MISSING_ERROR
@ -32,7 +32,7 @@ define STACK_MISSING_ERROR
# #
# Please run the download script: #
# #
# drivers/bluetooth/download_ble_stack.sh #
# bluetooth/download_ble_stack.sh #
# #
#######################################################

0
ports/nrf/drivers/bluetooth/download_ble_stack.sh → ports/nrf/bluetooth/download_ble_stack.sh
View File

0
ports/nrf/drivers/bluetooth/ringbuffer.h → ports/nrf/bluetooth/ringbuffer.h
View File

2
ports/nrf/boards/feather_nrf52832/README.md
View File

@ -18,7 +18,7 @@ You then need to download the SD and Nordic SDK files via:
```
$ cd ports/nrf
$ ./drivers/bluetooth/download_ble_stack.sh
$ ./bluetooth/download_ble_stack.sh
```
## Installing `adafruit-nrfutil`

2
ports/nrf/boards/feather_nrf52840_express/README.md
View File

@ -33,7 +33,7 @@ You then need to download the SD and Nordic SDK files via:
```
$ cd ports/nrf
$ ./drivers/bluetooth/download_ble_stack.sh
$ ./bluetooth/download_ble_stack.sh
```
## Installing the Serial Bootloader