Skip to content

Commit d5a71a4

Browse files
arturo182arturo182
committed
nrf: Move bluetooth driver to the 'bluetooth' folder
1 parent 17f13ec commit d5a71a4

11 files changed

Lines changed: 10 additions & 12 deletions

File tree

‎ports/nrf/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Nordic files
22
#####################
3-
drivers/bluetooth/s1*/
3+
bluetooth/s1*/
44

55
# Build files
66
#####################

‎ports/nrf/Makefile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ include ../../py/mkenv.mk
2121
-include mpconfigport.mk
2222

2323
ifneq ($(SD), )
24-
include drivers/bluetooth/bluetooth_common.mk
24+
include bluetooth/bluetooth_common.mk
2525
endif
2626

2727
FROZEN_MPY_DIR = freeze
@@ -41,16 +41,14 @@ INC += -I$(BUILD)
4141
INC += -I$(BUILD)/genhdr
4242
INC += -I./../../lib/cmsis/inc
4343
INC += -I./boards/$(BOARD)
44+
INC += -I./bluetooth
4445
INC += -I./modules/ubluepy
4546
INC += -I./modules/ble
4647
INC += -I./nrfx
4748
INC += -I./nrfx/hal
4849
INC += -I./nrfx/mdk
4950
INC += -I./nrfx/drivers/include
5051
INC += -I../../lib/mp-readline
51-
INC += -I./drivers/bluetooth
52-
INC += -I./drivers
53-
INC += -I./peripherals
5452
INC += -I../../lib/tinyusb/src
5553
INC += -I./usb
5654

ports/nrf/drivers/bluetooth/ble_drv.c renamed to ports/nrf/bluetooth/ble_drv.c

File renamed without changes.

ports/nrf/drivers/bluetooth/ble_drv.h renamed to ports/nrf/bluetooth/ble_drv.h

File renamed without changes.

ports/nrf/drivers/bluetooth/ble_uart.c renamed to ports/nrf/bluetooth/ble_uart.c

File renamed without changes.

ports/nrf/drivers/bluetooth/ble_uart.h renamed to ports/nrf/bluetooth/ble_uart.h

File renamed without changes.

ports/nrf/drivers/bluetooth/bluetooth_common.mk renamed to ports/nrf/bluetooth/bluetooth_common.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ endif
1515

1616
CFLAGS += -DBLUETOOTH_SD_DEBUG=1
1717

18-
INC += -Idrivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include
19-
INC += -Idrivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT)
18+
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include
19+
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT)
2020

2121
SOFTDEV_HEX_NAME = $(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_softdevice.hex
22-
SOFTDEV_HEX_PATH = drivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)
22+
SOFTDEV_HEX_PATH = bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)
2323
SOFTDEV_HEX = $(SOFTDEV_HEX_PATH)/$(SOFTDEV_HEX_NAME)
2424

2525
define STACK_MISSING_ERROR
@@ -32,7 +32,7 @@ define STACK_MISSING_ERROR
3232
# #
3333
# Please run the download script: #
3434
# #
35-
# drivers/bluetooth/download_ble_stack.sh #
35+
# bluetooth/download_ble_stack.sh #
3636
# #
3737
#######################################################
3838

ports/nrf/drivers/bluetooth/download_ble_stack.sh renamed to ports/nrf/bluetooth/download_ble_stack.sh

File renamed without changes.

ports/nrf/drivers/bluetooth/ringbuffer.h renamed to ports/nrf/bluetooth/ringbuffer.h

File renamed without changes.

‎ports/nrf/boards/feather_nrf52832/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ You then need to download the SD and Nordic SDK files via:
1818
1919
```
2020
$ cd ports/nrf
21-
$ ./drivers/bluetooth/download_ble_stack.sh
21+
$ ./bluetooth/download_ble_stack.sh
2222
```
2323

2424
## Installing `adafruit-nrfutil`

0 commit comments

Comments
 (0)