Properly guard NimBLE files

lucasssvaz · lucasssvaz · commit 18a2e059a08e · 2025-02-03T10:36:38.000-03:00
diff --git a/libraries/NimBLE/src/BLE2904.h b/libraries/NimBLE/src/BLE2904.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_2904_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLEDescriptor.h"
 
diff --git a/libraries/NimBLE/src/BLEAddress.h b/libraries/NimBLE/src/BLEAddress.h
@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_ADDRESS_H_
 #define NIMBLE_CPP_ADDRESS_H_
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_NIMBLE_ENABLED)
 
 #include "nimble/ble.h"
 
diff --git a/libraries/NimBLE/src/BLEAdvertisedDevice.h b/libraries/NimBLE/src/BLEAdvertisedDevice.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_ADVERTISED_DEVICE_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "BLEAddress.h"
 #include "BLEScan.h"
diff --git a/libraries/NimBLE/src/BLEAdvertisementData.h b/libraries/NimBLE/src/BLEAdvertisementData.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_ADVERTISEMENT_DATA_H_
 
 #include "sdkconfig.h"
-#if (defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
+#if (defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
 
 #include <cstdint>
 #include <string>
diff --git a/libraries/NimBLE/src/BLEAdvertising.h b/libraries/NimBLE/src/BLEAdvertising.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_ADVERTISING_H_
 
 #include "sdkconfig.h"
-#if (defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
+#if (defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
 
 #include "host/ble_gap.h"
 
diff --git a/libraries/NimBLE/src/BLEAttValue.h b/libraries/NimBLE/src/BLEAttValue.h
@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_ATTVALUE_H
 #define NIMBLE_CPP_ATTVALUE_H
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_NIMBLE_ENABLED)
 
 #include <Arduino.h>
 
diff --git a/libraries/NimBLE/src/BLEAttribute.h b/libraries/NimBLE/src/BLEAttribute.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_ATTRIBUTE_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && (defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL) || defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL))
+#if defined(CONFIG_NIMBLE_ENABLED) && (defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL) || defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL))
 
 #include "BLEUUID.h"
 
diff --git a/libraries/NimBLE/src/BLEBeacon.h b/libraries/NimBLE/src/BLEBeacon.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_BEACON_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
 class BLEUUID;
 
diff --git a/libraries/NimBLE/src/BLECharacteristic.h b/libraries/NimBLE/src/BLECharacteristic.h
@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_CHARACTERISTIC_H_
 #define NIMBLE_CPP_CHARACTERISTIC_H_
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 class BLECharacteristicCallbacks;
 class BLEService;
diff --git a/libraries/NimBLE/src/BLEClient.h b/libraries/NimBLE/src/BLEClient.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_CLIENT_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "host/ble_gap.h"
 
diff --git a/libraries/NimBLE/src/BLEConnInfo.h b/libraries/NimBLE/src/BLEConnInfo.h
@@ -18,6 +18,9 @@
 #ifndef NIMBLECONNINFO_H_
 #define NIMBLECONNINFO_H_
 
+#include "sdkconfig.h"
+#ifdef CONFIG_NIMBLE_ENABLED
+
 #include "host/ble_gap.h"
 
 #include "BLEAddress.h"
@@ -104,4 +107,6 @@ class BLEConnInfo {
     m_desc = desc;
   }
 };
+
+#endif
 #endif
diff --git a/libraries/NimBLE/src/BLEDescriptor.h b/libraries/NimBLE/src/BLEDescriptor.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_DESCRIPTOR_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLELocalValueAttribute.h"
 #include <string>
diff --git a/libraries/NimBLE/src/BLEDevice.h b/libraries/NimBLE/src/BLEDevice.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_DEVICE_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_NIMBLE_ENABLED)
 #ifndef CONFIG_IDF_TARGET_ESP32P4
 #include <esp_bt.h>
 #endif
diff --git a/libraries/NimBLE/src/BLEEddystoneTLM.h b/libraries/NimBLE/src/BLEEddystoneTLM.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_EDDYSTONETLM_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
 class BLEUUID;
 
diff --git a/libraries/NimBLE/src/BLEExtAdvertising.h b/libraries/NimBLE/src/BLEExtAdvertising.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_EXTADVERTISING_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && CONFIG_BT_NIMBLE_EXT_ADV
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && CONFIG_BT_NIMBLE_EXT_ADV
 
 #include "host/ble_gap.h"
 
diff --git a/libraries/NimBLE/src/BLEHIDDevice.h b/libraries/NimBLE/src/BLEHIDDevice.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_HIDDEVICE_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include <stdint.h>
 #include <string>
diff --git a/libraries/NimBLE/src/BLELocalAttribute.h b/libraries/NimBLE/src/BLELocalAttribute.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_LOCAL_ATTRIBUTE_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLEAttribute.h"
 
diff --git a/libraries/NimBLE/src/BLELocalValueAttribute.h b/libraries/NimBLE/src/BLELocalValueAttribute.h
@@ -19,7 +19,7 @@
 #define NIMBLE_LOCAL_VALUE_ATTRIBUTE_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "host/ble_hs.h"
 
diff --git a/libraries/NimBLE/src/BLERemoteCharacteristic.h b/libraries/NimBLE/src/BLERemoteCharacteristic.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_REMOTE_CHARACTERISTIC_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "BLERemoteValueAttribute.h"
 #include <vector>
diff --git a/libraries/NimBLE/src/BLERemoteDescriptor.h b/libraries/NimBLE/src/BLERemoteDescriptor.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_REMOTE_DESCRIPTOR_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "BLERemoteValueAttribute.h"
 
diff --git a/libraries/NimBLE/src/BLERemoteService.h b/libraries/NimBLE/src/BLERemoteService.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_REMOTE_SERVICE_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "BLEAttribute.h"
 #include <vector>
diff --git a/libraries/NimBLE/src/BLERemoteValueAttribute.h b/libraries/NimBLE/src/BLERemoteValueAttribute.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_REMOTE_VALUE_ATTRIBUTE_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include <host/ble_gatt.h>
 
diff --git a/libraries/NimBLE/src/BLEScan.h b/libraries/NimBLE/src/BLEScan.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_SCAN_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "BLEAdvertisedDevice.h"
 #include "BLEUtils.h"
diff --git a/libraries/NimBLE/src/BLEServer.h b/libraries/NimBLE/src/BLEServer.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_SERVER_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "host/ble_gap.h"
 
diff --git a/libraries/NimBLE/src/BLEService.h b/libraries/NimBLE/src/BLEService.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_SERVICE_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 class BLEService;
 
diff --git a/libraries/NimBLE/src/BLEUUID.h b/libraries/NimBLE/src/BLEUUID.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_UUID_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_NIMBLE_ENABLED)
 
 #include "host/ble_uuid.h"
 
diff --git a/libraries/NimBLE/src/BLEUtils.h b/libraries/NimBLE/src/BLEUtils.h
@@ -19,7 +19,7 @@
 #define NIMBLE_CPP_UTILS_H_
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_NIMBLE_ENABLED)
 #include <string>
 
 class BLEAddress;
diff --git a/libraries/NimBLE/src/NimBLE2904.cpp b/libraries/NimBLE/src/NimBLE2904.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLE2904.h"
 
diff --git a/libraries/NimBLE/src/NimBLEAddress.cpp b/libraries/NimBLE/src/NimBLEAddress.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_NIMBLE_ENABLED)
 
 #include "BLEAddress.h"
 
diff --git a/libraries/NimBLE/src/NimBLEAdvertisedDevice.cpp b/libraries/NimBLE/src/NimBLEAdvertisedDevice.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "BLEDevice.h"
 #include "BLEAdvertisedDevice.h"
diff --git a/libraries/NimBLE/src/NimBLEAdvertisementData.cpp b/libraries/NimBLE/src/NimBLEAdvertisementData.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if (defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
+#if (defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
 
 #include "BLEAdvertisementData.h"
 #include "BLEDevice.h"
diff --git a/libraries/NimBLE/src/NimBLEAdvertising.cpp b/libraries/NimBLE/src/NimBLEAdvertising.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if (defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
+#if (defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
 
 #include "services/gap/ble_svc_gap.h"
 
diff --git a/libraries/NimBLE/src/NimBLEAttValue.cpp b/libraries/NimBLE/src/NimBLEAttValue.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_NIMBLE_ENABLED)
 
 #include "nimble/nimble_npl.h"
 
diff --git a/libraries/NimBLE/src/NimBLEBeacon.cpp b/libraries/NimBLE/src/NimBLEBeacon.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
 #include "BLEBeacon.h"
 #include "BLEUUID.h"
diff --git a/libraries/NimBLE/src/NimBLECharacteristic.cpp b/libraries/NimBLE/src/NimBLECharacteristic.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLECharacteristic.h"
 #include "BLE2904.h"
diff --git a/libraries/NimBLE/src/NimBLEClient.cpp b/libraries/NimBLE/src/NimBLEClient.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "BLEClient.h"
 #include "BLERemoteService.h"
diff --git a/libraries/NimBLE/src/NimBLEDescriptor.cpp b/libraries/NimBLE/src/NimBLEDescriptor.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLEService.h"
 #include "BLEDescriptor.h"
diff --git a/libraries/NimBLE/src/NimBLEDevice.cpp b/libraries/NimBLE/src/NimBLEDevice.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_NIMBLE_ENABLED)
 
 #include "BLEDevice.h"
 #include "BLEUtils.h"
diff --git a/libraries/NimBLE/src/NimBLEEddystoneTLM.cpp b/libraries/NimBLE/src/NimBLEEddystoneTLM.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
 #include "BLEEddystoneTLM.h"
 #include "BLEUUID.h"
diff --git a/libraries/NimBLE/src/NimBLEExtAdvertising.cpp b/libraries/NimBLE/src/NimBLEExtAdvertising.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && CONFIG_BT_NIMBLE_EXT_ADV
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && CONFIG_BT_NIMBLE_EXT_ADV
 
 #include "services/gap/ble_svc_gap.h"
 
diff --git a/libraries/NimBLE/src/NimBLEHIDDevice.cpp b/libraries/NimBLE/src/NimBLEHIDDevice.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLEHIDDevice.h"
 #include "BLEServer.h"
diff --git a/libraries/NimBLE/src/NimBLERemoteCharacteristic.cpp b/libraries/NimBLE/src/NimBLERemoteCharacteristic.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "BLERemoteCharacteristic.h"
 #include "BLERemoteDescriptor.h"
diff --git a/libraries/NimBLE/src/NimBLERemoteDescriptor.cpp b/libraries/NimBLE/src/NimBLERemoteDescriptor.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "BLERemoteDescriptor.h"
 #include "BLERemoteCharacteristic.h"
diff --git a/libraries/NimBLE/src/NimBLERemoteService.cpp b/libraries/NimBLE/src/NimBLERemoteService.cpp
diff --git a/libraries/NimBLE/src/NimBLERemoteValueAttribute.cpp b/libraries/NimBLE/src/NimBLERemoteValueAttribute.cpp
diff --git a/libraries/NimBLE/src/NimBLEScan.cpp b/libraries/NimBLE/src/NimBLEScan.cpp
diff --git a/libraries/NimBLE/src/NimBLEServer.cpp b/libraries/NimBLE/src/NimBLEServer.cpp
diff --git a/libraries/NimBLE/src/NimBLEService.cpp b/libraries/NimBLE/src/NimBLEService.cpp
diff --git a/libraries/NimBLE/src/NimBLEUUID.cpp b/libraries/NimBLE/src/NimBLEUUID.cpp
diff --git a/libraries/NimBLE/src/NimBLEUtils.cpp b/libraries/NimBLE/src/NimBLEUtils.cpp
