Skip to content

Commit 20ddeb0

Browse files
lucasssvazlucasssvaz
committed
Add guards
1 parent 5ba4c21 commit 20ddeb0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+102
-358
lines changed

‎libraries/BLE/src/BLE2901.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#if SOC_BLE_SUPPORTED
2020

2121
#include "sdkconfig.h"
22-
#if defined(CONFIG_BLUEDROID_ENABLED)
22+
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
2323

2424
#include "BLE2901.h"
2525

‎libraries/BLE/src/BLE2901.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#if SOC_BLE_SUPPORTED
2323

2424
#include "sdkconfig.h"
25-
#if defined(CONFIG_BLUEDROID_ENABLED)
25+
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
2626

2727
#include "BLEDescriptor.h"
2828

@@ -32,6 +32,6 @@ class BLE2901 : public BLEDescriptor {
3232
void setDescription(String desc);
3333
}; // BLE2901
3434

35-
#endif /* CONFIG_BLUEDROID_ENABLED */
35+
#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */
3636
#endif /* SOC_BLE_SUPPORTED */
3737
#endif /* COMPONENTS_CPP_UTILS_BLE2901_H_ */

‎libraries/BLE/src/BLE2902.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#if SOC_BLE_SUPPORTED
1414

1515
#include "sdkconfig.h"
16-
#if defined(CONFIG_BLUEDROID_ENABLED)
16+
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
1717

1818
#include "BLE2902.h"
1919

‎libraries/BLE/src/BLE2902.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#if SOC_BLE_SUPPORTED
1212

1313
#include "sdkconfig.h"
14-
#if defined(CONFIG_BLUEDROID_ENABLED)
14+
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
1515

1616
#include "BLEDescriptor.h"
1717

@@ -33,6 +33,6 @@ class BLE2902 : public BLEDescriptor {
3333

3434
}; // BLE2902
3535

36-
#endif /* CONFIG_BLUEDROID_ENABLED */
36+
#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */
3737
#endif /* SOC_BLE_SUPPORTED */
3838
#endif /* COMPONENTS_CPP_UTILS_BLE2902_H_ */

‎libraries/BLE/src/BLE2904.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#if SOC_BLE_SUPPORTED
1414

1515
#include "sdkconfig.h"
16-
#if defined(CONFIG_BLUEDROID_ENABLED)
16+
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
1717

1818
#include "BLE2904.h"
1919

‎libraries/BLE/src/BLE2904.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#if SOC_BLE_SUPPORTED
1212

1313
#include "sdkconfig.h"
14-
#if defined(CONFIG_BLUEDROID_ENABLED)
14+
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
1515

1616
#include "BLEDescriptor.h"
1717

@@ -73,6 +73,6 @@ class BLE2904 : public BLEDescriptor {
7373
BLE2904_Data m_data;
7474
}; // BLE2904
7575

76-
#endif /* CONFIG_BLUEDROID_ENABLED */
76+
#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */
7777
#endif /* SOC_BLE_SUPPORTED */
7878
#endif /* COMPONENTS_CPP_UTILS_BLE2904_H_ */

‎libraries/BLE/src/BLEAddress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#if SOC_BLE_SUPPORTED
99

1010
#include "sdkconfig.h"
11-
#if defined(CONFIG_BLUEDROID_ENABLED)
11+
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
1212

1313
#include "BLEAddress.h"
1414
#include <string>

‎libraries/BLE/src/BLEAddress.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#if SOC_BLE_SUPPORTED
1313

1414
#include "sdkconfig.h"
15-
#if defined(CONFIG_BLUEDROID_ENABLED)
15+
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
1616
#include <esp_gap_ble_api.h> // ESP32 BLE
1717
#include <string>
1818

@@ -39,6 +39,6 @@ class BLEAddress {
3939
esp_bd_addr_t m_address;
4040
};
4141

42-
#endif /* CONFIG_BLUEDROID_ENABLED */
42+
#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */
4343
#endif /* SOC_BLE_SUPPORTED */
4444
#endif /* COMPONENTS_CPP_UTILS_BLEADDRESS_H_ */

‎libraries/BLE/src/BLEAdvertisedDevice.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "soc/soc_caps.h"
1515
#if SOC_BLE_SUPPORTED
1616
#include "sdkconfig.h"
17-
#if defined(CONFIG_BLUEDROID_ENABLED)
17+
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
1818
#include <sstream>
1919
#include "BLEAdvertisedDevice.h"
2020
#include "BLEUtils.h"
@@ -595,5 +595,5 @@ size_t BLEAdvertisedDevice::getPayloadLength() {
595595
return m_payloadLength;
596596
}
597597

598-
#endif /* CONFIG_BLUEDROID_ENABLED */
598+
#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */
599599
#endif /* SOC_BLE_SUPPORTED */

‎libraries/BLE/src/BLEAdvertisedDevice.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#if SOC_BLE_SUPPORTED
1212

1313
#include "sdkconfig.h"
14-
#if defined(CONFIG_BLUEDROID_ENABLED)
14+
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
1515
#include <esp_gattc_api.h>
1616

1717
#include <map>
@@ -147,6 +147,6 @@ class BLEExtAdvertisingCallbacks {
147147
};
148148
#endif // SOC_BLE_50_SUPPORTED
149149

150-
#endif /* CONFIG_BLUEDROID_ENABLED */
150+
#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */
151151
#endif /* SOC_BLE_SUPPORTED */
152152
#endif /* COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ */

0 commit comments

Comments
 (0)