From 309ae12346c4e42d1e25fbef1d3309d2da8fadb2 Mon Sep 17 00:00:00 2001 From: Glenn Ruben Bakke Date: Sat, 4 Mar 2017 15:06:08 +0100 Subject: [PATCH] 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. --- nrf5/Makefile | 2 +- nrf5/mpconfigport.h | 2 +- nrf5/sdk/{sdk_common.mk => bluetooth_common.mk} | 0 nrf5/sdk/help_sd.h | 2 +- nrf5/sdk/iot_0.9.0/modnwble6lowpan.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename nrf5/sdk/{sdk_common.mk => bluetooth_common.mk} (100%) diff --git a/nrf5/Makefile b/nrf5/Makefile index f48660b413..cf71189da2 100644 --- 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) diff --git a/nrf5/mpconfigport.h b/nrf5/mpconfigport.h index 903bb6848f..f0596de52b 100644 --- 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 diff --git a/nrf5/sdk/sdk_common.mk b/nrf5/sdk/bluetooth_common.mk similarity index 100% rename from nrf5/sdk/sdk_common.mk rename to nrf5/sdk/bluetooth_common.mk diff --git a/nrf5/sdk/help_sd.h b/nrf5/sdk/help_sd.h index f6d5ef6565..fa48d4a578 100644 --- 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 diff --git a/nrf5/sdk/iot_0.9.0/modnwble6lowpan.c b/nrf5/sdk/iot_0.9.0/modnwble6lowpan.c index 80f1b81e0a..f8b3be89f4 100644 --- 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