feedc0de/esp-nimble-cpp
1
0
Fork 0
forked from h2zero/esp-nimble-cpp
Code Pull Requests Activity

fix compiling issues when nimble is disabled in sdkconfig

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-09-21 16:49:45 +02:00
parent 7f853fa04b
commit 641f297120
16 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NimBLEAddress.cpp
View File

@ -12,7 +12,7 @@
* Author: kolban * Author: kolban
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include <algorithm> #include <algorithm>

2
src/NimBLEAddress.h
View File

@ -15,7 +15,7 @@
#ifndef COMPONENTS_NIMBLEADDRESS_H_ #ifndef COMPONENTS_NIMBLEADDRESS_H_
#define COMPONENTS_NIMBLEADDRESS_H_ #define COMPONENTS_NIMBLEADDRESS_H_
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "nimble/ble.h" #include "nimble/ble.h"
/**** FIX COMPILATION ****/ /**** FIX COMPILATION ****/

2
src/NimBLEBeacon.cpp
View File

@ -12,7 +12,7 @@
* Author: kolban * Author: kolban
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include <string.h> #include <string.h>
#include <algorithm> #include <algorithm>

2
src/NimBLEBeacon.h
View File

@ -15,6 +15,7 @@
#ifndef MAIN_NIMBLEBEACON_H_ #ifndef MAIN_NIMBLEBEACON_H_
#define MAIN_NIMBLEBEACON_H_ #define MAIN_NIMBLEBEACON_H_
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "NimBLEUUID.h" #include "NimBLEUUID.h"
/** /**
* @brief Representation of a beacon. * @brief Representation of a beacon.
@ -48,4 +49,5 @@ public:
void setSignalPower(int8_t signalPower); void setSignalPower(int8_t signalPower);
}; // NimBLEBeacon }; // NimBLEBeacon
#endif
#endif /* MAIN_NIMBLEBEACON_H_ */ #endif /* MAIN_NIMBLEBEACON_H_ */

2
src/NimBLEDevice.cpp
View File

@ -12,7 +12,7 @@
* Author: kolban * Author: kolban
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "nimconfig.h" #include "nimconfig.h"
#include "NimBLEDevice.h" #include "NimBLEDevice.h"

2
src/NimBLEDevice.h
View File

@ -15,7 +15,7 @@
#ifndef MAIN_NIMBLEDEVICE_H_ #ifndef MAIN_NIMBLEDEVICE_H_
#define MAIN_NIMBLEDEVICE_H_ #define MAIN_NIMBLEDEVICE_H_
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "nimconfig.h" #include "nimconfig.h"

2
src/NimBLEEddystoneTLM.cpp
View File

@ -12,7 +12,7 @@
* Author: pcbreflux * Author: pcbreflux
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "NimBLEEddystoneTLM.h" #include "NimBLEEddystoneTLM.h"
#include "NimBLELog.h" #include "NimBLELog.h"

3
src/NimBLEEddystoneTLM.h
View File

@ -14,6 +14,8 @@
#ifndef _NimBLEEddystoneTLM_H_ #ifndef _NimBLEEddystoneTLM_H_
#define _NimBLEEddystoneTLM_H_ #define _NimBLEEddystoneTLM_H_
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "NimBLEUUID.h" #include "NimBLEUUID.h"
#include <string> #include <string>
@ -57,4 +59,5 @@ private:
}; // NimBLEEddystoneTLM }; // NimBLEEddystoneTLM
#endif
#endif /* _NimBLEEddystoneTLM_H_ */ #endif /* _NimBLEEddystoneTLM_H_ */

2
src/NimBLEEddystoneURL.cpp
View File

@ -12,7 +12,7 @@
* Author: pcbreflux * Author: pcbreflux
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "NimBLEEddystoneURL.h" #include "NimBLEEddystoneURL.h"
#include "NimBLELog.h" #include "NimBLELog.h"

2
src/NimBLEEddystoneURL.h
View File

@ -14,6 +14,7 @@
#ifndef _NIMBLEEddystoneURL_H_ #ifndef _NIMBLEEddystoneURL_H_
#define _NIMBLEEddystoneURL_H_ #define _NIMBLEEddystoneURL_H_
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "NimBLEUUID.h" #include "NimBLEUUID.h"
#include <string> #include <string>
@ -49,4 +50,5 @@ private:
}; // NIMBLEEddystoneURL }; // NIMBLEEddystoneURL
#endif
#endif /* _NIMBLEEddystoneURL_H_ */ #endif /* _NIMBLEEddystoneURL_H_ */

2
src/NimBLESecurity.cpp
View File

@ -13,7 +13,7 @@
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "NimBLESecurity.h" #include "NimBLESecurity.h"
#include "NimBLEDevice.h" #include "NimBLEDevice.h"

2
src/NimBLESecurity.h
View File

@ -15,7 +15,7 @@
#ifndef COMPONENTS_NIMBLESECURITY_H_ #ifndef COMPONENTS_NIMBLESECURITY_H_
#define COMPONENTS_NIMBLESECURITY_H_ #define COMPONENTS_NIMBLESECURITY_H_
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "host/ble_gap.h" #include "host/ble_gap.h"
/**** FIX COMPILATION ****/ /**** FIX COMPILATION ****/

2
src/NimBLEUUID.cpp
View File

@ -12,7 +12,7 @@
* Author: kolban * Author: kolban
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "NimBLEUtils.h" #include "NimBLEUtils.h"
#include "NimBLEUUID.h" #include "NimBLEUUID.h"

2
src/NimBLEUUID.h
View File

@ -15,7 +15,7 @@
#ifndef COMPONENTS_NIMBLEUUID_H_ #ifndef COMPONENTS_NIMBLEUUID_H_
#define COMPONENTS_NIMBLEUUID_H_ #define COMPONENTS_NIMBLEUUID_H_
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "host/ble_uuid.h" #include "host/ble_uuid.h"
/**** FIX COMPILATION ****/ /**** FIX COMPILATION ****/

2
src/NimBLEUtils.cpp
View File

@ -7,7 +7,7 @@
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "NimBLEUtils.h" #include "NimBLEUtils.h"
#include "NimBLELog.h" #include "NimBLELog.h"

2
src/NimBLEUtils.h
View File

@ -9,7 +9,7 @@
#ifndef COMPONENTS_NIMBLEUTILS_H_ #ifndef COMPONENTS_NIMBLEUTILS_H_
#define COMPONENTS_NIMBLEUTILS_H_ #define COMPONENTS_NIMBLEUTILS_H_
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
#include "host/ble_gap.h" #include "host/ble_gap.h"