nrf5: Starting process of renaming files in sdk folder to facilitate renaming of the folder and make it more logical. Transition will be from sdk to bluetooth.

2017-03-04 15:06:08 +01:00 · 2017-03-04 15:06:08 +01:00 · 309ae12346
parent 80c9c2e3c0
commit 309ae12346
5 changed files with 4 additions and 4 deletions
--- a/nrf5/Makefile
+++ b/nrf5/Makefile
@ -31,7 +31,7 @@ else
 	include ../py/mkenv.mk
 	include boards/$(BOARD)/mpconfigboard_$(SD_LOWER).mk

-	include sdk/sdk_common.mk
+	include sdk/bluetooth_common.mk
 endif

 # qstr definitions (must come before including py.mk)
--- a/nrf5/mpconfigport.h
+++ b/nrf5/mpconfigport.h
@ -206,7 +206,7 @@

 // if sdk is in use, import configuration
 #if BLUETOOTH_SD
-#include "nrf5_sdk_conf.h"
+#include "bluetooth_conf.h"
 #endif

 #ifndef MICROPY_PY_UBLUEPY
--- a/nrf5/sdk/bluetooth_common.mk
+++ b/nrf5/sdk/bluetooth_common.mk
--- a/nrf5/sdk/help_sd.h
+++ b/nrf5/sdk/help_sd.h
@ -27,7 +27,7 @@
 #ifndef HELP_SD_H__
 #define HELP_SD_H__

-#include "nrf5_sdk_conf.h"
+#include "bluetooth_conf.h"

 #if MICROPY_PY_BLE

--- a/nrf5/sdk/iot_0.9.0/modnwble6lowpan.c
+++ b/nrf5/sdk/iot_0.9.0/modnwble6lowpan.c
@ -24,7 +24,7 @@
 * THE SOFTWARE.
 */

-#include "nrf5_sdk_conf.h"
+#include "bluetooth_conf.h"

 #if MICROPY_PY_BLE_6LOWPAN