From 641f297120097974827ad3fe1a1e7d6024969e9c Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Tue, 21 Sep 2021 16:49:45 +0200 Subject: [PATCH] fix compiling issues when nimble is disabled in sdkconfig --- src/NimBLEAddress.cpp | 2 +- src/NimBLEAddress.h | 2 +- src/NimBLEBeacon.cpp | 2 +- src/NimBLEBeacon.h | 2 ++ src/NimBLEDevice.cpp | 2 +- src/NimBLEDevice.h | 2 +- src/NimBLEEddystoneTLM.cpp | 2 +- src/NimBLEEddystoneTLM.h | 3 +++ src/NimBLEEddystoneURL.cpp | 2 +- src/NimBLEEddystoneURL.h | 2 ++ src/NimBLESecurity.cpp | 2 +- src/NimBLESecurity.h | 2 +- src/NimBLEUUID.cpp | 2 +- src/NimBLEUUID.h | 2 +- src/NimBLEUtils.cpp | 2 +- src/NimBLEUtils.h | 2 +- 16 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/NimBLEAddress.cpp b/src/NimBLEAddress.cpp index e1d3e54..8595ac3 100644 --- a/src/NimBLEAddress.cpp +++ b/src/NimBLEAddress.cpp @@ -12,7 +12,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include diff --git a/src/NimBLEAddress.h b/src/NimBLEAddress.h index 50f9231..c43f9be 100644 --- a/src/NimBLEAddress.h +++ b/src/NimBLEAddress.h @@ -15,7 +15,7 @@ #ifndef COMPONENTS_NIMBLEADDRESS_H_ #define COMPONENTS_NIMBLEADDRESS_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "nimble/ble.h" /**** FIX COMPILATION ****/ diff --git a/src/NimBLEBeacon.cpp b/src/NimBLEBeacon.cpp index 8c4574b..12208a6 100644 --- a/src/NimBLEBeacon.cpp +++ b/src/NimBLEBeacon.cpp @@ -12,7 +12,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include #include diff --git a/src/NimBLEBeacon.h b/src/NimBLEBeacon.h index 82ee61c..67a197b 100644 --- a/src/NimBLEBeacon.h +++ b/src/NimBLEBeacon.h @@ -15,6 +15,7 @@ #ifndef MAIN_NIMBLEBEACON_H_ #define MAIN_NIMBLEBEACON_H_ +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "NimBLEUUID.h" /** * @brief Representation of a beacon. @@ -48,4 +49,5 @@ public: void setSignalPower(int8_t signalPower); }; // NimBLEBeacon +#endif #endif /* MAIN_NIMBLEBEACON_H_ */ diff --git a/src/NimBLEDevice.cpp b/src/NimBLEDevice.cpp index ea1777d..42f6756 100644 --- a/src/NimBLEDevice.cpp +++ b/src/NimBLEDevice.cpp @@ -12,7 +12,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "nimconfig.h" #include "NimBLEDevice.h" diff --git a/src/NimBLEDevice.h b/src/NimBLEDevice.h index 08a042f..0e23289 100644 --- a/src/NimBLEDevice.h +++ b/src/NimBLEDevice.h @@ -15,7 +15,7 @@ #ifndef MAIN_NIMBLEDEVICE_H_ #define MAIN_NIMBLEDEVICE_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "nimconfig.h" diff --git a/src/NimBLEEddystoneTLM.cpp b/src/NimBLEEddystoneTLM.cpp index a072942..538d3da 100644 --- a/src/NimBLEEddystoneTLM.cpp +++ b/src/NimBLEEddystoneTLM.cpp @@ -12,7 +12,7 @@ * Author: pcbreflux */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "NimBLEEddystoneTLM.h" #include "NimBLELog.h" diff --git a/src/NimBLEEddystoneTLM.h b/src/NimBLEEddystoneTLM.h index eb1cb07..8e4ea90 100644 --- a/src/NimBLEEddystoneTLM.h +++ b/src/NimBLEEddystoneTLM.h @@ -14,6 +14,8 @@ #ifndef _NimBLEEddystoneTLM_H_ #define _NimBLEEddystoneTLM_H_ + +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "NimBLEUUID.h" #include @@ -57,4 +59,5 @@ private: }; // NimBLEEddystoneTLM +#endif #endif /* _NimBLEEddystoneTLM_H_ */ diff --git a/src/NimBLEEddystoneURL.cpp b/src/NimBLEEddystoneURL.cpp index 7c3194c..d94f266 100644 --- a/src/NimBLEEddystoneURL.cpp +++ b/src/NimBLEEddystoneURL.cpp @@ -12,7 +12,7 @@ * Author: pcbreflux */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "NimBLEEddystoneURL.h" #include "NimBLELog.h" diff --git a/src/NimBLEEddystoneURL.h b/src/NimBLEEddystoneURL.h index 9c5f37f..f73d79c 100644 --- a/src/NimBLEEddystoneURL.h +++ b/src/NimBLEEddystoneURL.h @@ -14,6 +14,7 @@ #ifndef _NIMBLEEddystoneURL_H_ #define _NIMBLEEddystoneURL_H_ +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "NimBLEUUID.h" #include @@ -49,4 +50,5 @@ private: }; // NIMBLEEddystoneURL +#endif #endif /* _NIMBLEEddystoneURL_H_ */ diff --git a/src/NimBLESecurity.cpp b/src/NimBLESecurity.cpp index aa06296..13777ae 100644 --- a/src/NimBLESecurity.cpp +++ b/src/NimBLESecurity.cpp @@ -13,7 +13,7 @@ */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "NimBLESecurity.h" #include "NimBLEDevice.h" diff --git a/src/NimBLESecurity.h b/src/NimBLESecurity.h index 5a7619f..cd1be7b 100644 --- a/src/NimBLESecurity.h +++ b/src/NimBLESecurity.h @@ -15,7 +15,7 @@ #ifndef COMPONENTS_NIMBLESECURITY_H_ #define COMPONENTS_NIMBLESECURITY_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "host/ble_gap.h" /**** FIX COMPILATION ****/ diff --git a/src/NimBLEUUID.cpp b/src/NimBLEUUID.cpp index 9338d7d..75ba2db 100644 --- a/src/NimBLEUUID.cpp +++ b/src/NimBLEUUID.cpp @@ -12,7 +12,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "NimBLEUtils.h" #include "NimBLEUUID.h" diff --git a/src/NimBLEUUID.h b/src/NimBLEUUID.h index 982f9c3..c28d81a 100644 --- a/src/NimBLEUUID.h +++ b/src/NimBLEUUID.h @@ -15,7 +15,7 @@ #ifndef COMPONENTS_NIMBLEUUID_H_ #define COMPONENTS_NIMBLEUUID_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "host/ble_uuid.h" /**** FIX COMPILATION ****/ diff --git a/src/NimBLEUtils.cpp b/src/NimBLEUtils.cpp index 7a1f55b..26f0212 100644 --- a/src/NimBLEUtils.cpp +++ b/src/NimBLEUtils.cpp @@ -7,7 +7,7 @@ */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "NimBLEUtils.h" #include "NimBLELog.h" diff --git a/src/NimBLEUtils.h b/src/NimBLEUtils.h index acbc93e..f90aeae 100644 --- a/src/NimBLEUtils.h +++ b/src/NimBLEUtils.h @@ -9,7 +9,7 @@ #ifndef COMPONENTS_NIMBLEUTILS_H_ #define COMPONENTS_NIMBLEUTILS_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED) #include "host/ble_gap.h"