Skip to content

Commit 64b51f9

Browse files
Jason2866Jason2866
committed
less changes
1 parent 403974d commit 64b51f9

Some content is hidden

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

66 files changed

+120
-120
lines changed

‎cores/esp32/esp32-hal-bt.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "sdkconfig.h"
1616
#include "soc/soc_caps.h"
17-
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
17+
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BLE_SUPPORTED
1818

1919
#include "esp_bt.h"
2020
#include "esp_bt_main.h"

‎cores/esp32/esp32-hal-bt.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define _ESP32_ESP32_HAL_BT_H_
1717

1818
#include "soc/soc_caps.h"
19-
#if SOC_BT_SUPPORTED
19+
#if SOC_BLE_SUPPORTED
2020

2121
#include "esp32-hal.h"
2222

@@ -40,6 +40,6 @@ bool btStop();
4040
}
4141
#endif
4242

43-
#endif /* SOC_BT_SUPPORTED */
43+
#endif /* SOC_BLE_SUPPORTED */
4444

4545
#endif /* _ESP32_ESP32_HAL_BT_H_ */

‎cores/esp32/esp32-hal-misc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "esp_ota_ops.h"
2727
#endif //CONFIG_APP_ROLLBACK_ENABLE
2828
#include "esp_private/startup_internal.h"
29-
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
29+
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BLE_SUPPORTED
3030
#include "esp_bt.h"
3131
#if CONFIG_IDF_TARGET_ESP32
3232
bool btInUse() __attribute__((weak));
@@ -304,7 +304,7 @@ void initArduino() {
304304
if (err) {
305305
log_e("Failed to initialize NVS! Error: %u", err);
306306
}
307-
#if defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
307+
#if defined(CONFIG_BLUEDROID_ENABLED) && SOC_BLE_SUPPORTED
308308
if (!btInUse()) {
309309
esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
310310
}

‎libraries/BLE/examples/Beacon_Scanner/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=huge_app",
33
"requires": [
4-
"CONFIG_SOC_BT_SUPPORTED=y"
4+
"CONFIG_SOC_BLE_SUPPORTED=y"
55
]
66
}

‎libraries/BLE/examples/Client/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=huge_app",
33
"requires": [
4-
"CONFIG_SOC_BT_SUPPORTED=y"
4+
"CONFIG_SOC_BLE_SUPPORTED=y"
55
]
66
}

‎libraries/BLE/examples/EddystoneTLM_Beacon/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=huge_app",
33
"requires": [
4-
"CONFIG_SOC_BT_SUPPORTED=y"
4+
"CONFIG_SOC_BLE_SUPPORTED=y"
55
]
66
}

‎libraries/BLE/examples/EddystoneURL_Beacon/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=huge_app",
33
"requires": [
4-
"CONFIG_SOC_BT_SUPPORTED=y"
4+
"CONFIG_SOC_BLE_SUPPORTED=y"
55
]
66
}

‎libraries/BLE/examples/Notify/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=huge_app",
33
"requires": [
4-
"CONFIG_SOC_BT_SUPPORTED=y"
4+
"CONFIG_SOC_BLE_SUPPORTED=y"
55
]
66
}

‎libraries/BLE/examples/Scan/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=huge_app",
33
"requires": [
4-
"CONFIG_SOC_BT_SUPPORTED=y"
4+
"CONFIG_SOC_BLE_SUPPORTED=y"
55
]
66
}

‎libraries/BLE/examples/Server/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=huge_app",
33
"requires": [
4-
"CONFIG_SOC_BT_SUPPORTED=y"
4+
"CONFIG_SOC_BLE_SUPPORTED=y"
55
]
66
}

‎libraries/BLE/examples/Server_multiconnect/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=huge_app",
33
"requires": [
4-
"CONFIG_SOC_BT_SUPPORTED=y"
4+
"CONFIG_SOC_BLE_SUPPORTED=y"
55
]
66
}

‎libraries/BLE/examples/UART/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=huge_app",
33
"requires": [
4-
"CONFIG_SOC_BT_SUPPORTED=y"
4+
"CONFIG_SOC_BLE_SUPPORTED=y"
55
]
66
}

‎libraries/BLE/examples/Write/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=huge_app",
33
"requires": [
4-
"CONFIG_SOC_BT_SUPPORTED=y"
4+
"CONFIG_SOC_BLE_SUPPORTED=y"
55
]
66
}

‎libraries/BLE/examples/iBeacon/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=huge_app",
33
"requires": [
4-
"CONFIG_SOC_BT_SUPPORTED=y"
4+
"CONFIG_SOC_BLE_SUPPORTED=y"
55
]
66
}

‎libraries/BLE/src/BLE2901.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#include "soc/soc_caps.h"
19-
#if SOC_BT_SUPPORTED
19+
#if SOC_BLE_SUPPORTED
2020

2121
#include "sdkconfig.h"
2222
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -37,4 +37,4 @@ void BLE2901::setDescription(String userDesc) {
3737
}
3838

3939
#endif
40-
#endif /* SOC_BT_SUPPORTED */
40+
#endif /* SOC_BLE_SUPPORTED */

‎libraries/BLE/src/BLE2901.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef COMPONENTS_CPP_UTILS_BLE2901_H_
2020
#define COMPONENTS_CPP_UTILS_BLE2901_H_
2121
#include "soc/soc_caps.h"
22-
#if SOC_BT_SUPPORTED
22+
#if SOC_BLE_SUPPORTED
2323

2424
#include "sdkconfig.h"
2525
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -33,5 +33,5 @@ class BLE2901 : public BLEDescriptor {
3333
}; // BLE2901
3434

3535
#endif /* CONFIG_BLUEDROID_ENABLED */
36-
#endif /* SOC_BT_SUPPORTED */
36+
#endif /* SOC_BLE_SUPPORTED */
3737
#endif /* COMPONENTS_CPP_UTILS_BLE2901_H_ */

‎libraries/BLE/src/BLE2902.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.client_characteristic_configuration.xml
1111
*/
1212
#include "soc/soc_caps.h"
13-
#if SOC_BT_SUPPORTED
13+
#if SOC_BLE_SUPPORTED
1414

1515
#include "sdkconfig.h"
1616
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -67,4 +67,4 @@ void BLE2902::setNotifications(bool flag) {
6767
} // setNotifications
6868

6969
#endif
70-
#endif /* SOC_BT_SUPPORTED */
70+
#endif /* SOC_BLE_SUPPORTED */

‎libraries/BLE/src/BLE2902.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef COMPONENTS_CPP_UTILS_BLE2902_H_
99
#define COMPONENTS_CPP_UTILS_BLE2902_H_
1010
#include "soc/soc_caps.h"
11-
#if SOC_BT_SUPPORTED
11+
#if SOC_BLE_SUPPORTED
1212

1313
#include "sdkconfig.h"
1414
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -34,5 +34,5 @@ class BLE2902 : public BLEDescriptor {
3434
}; // BLE2902
3535

3636
#endif /* CONFIG_BLUEDROID_ENABLED */
37-
#endif /* SOC_BT_SUPPORTED */
37+
#endif /* SOC_BLE_SUPPORTED */
3838
#endif /* COMPONENTS_CPP_UTILS_BLE2902_H_ */

‎libraries/BLE/src/BLE2904.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.characteristic_presentation_format.xml
1111
*/
1212
#include "soc/soc_caps.h"
13-
#if SOC_BT_SUPPORTED
13+
#if SOC_BLE_SUPPORTED
1414

1515
#include "sdkconfig.h"
1616
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -69,4 +69,4 @@ void BLE2904::setUnit(uint16_t unit) {
6969
} // setUnit
7070

7171
#endif
72-
#endif /* SOC_BT_SUPPORTED */
72+
#endif /* SOC_BLE_SUPPORTED */

‎libraries/BLE/src/BLE2904.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef COMPONENTS_CPP_UTILS_BLE2904_H_
99
#define COMPONENTS_CPP_UTILS_BLE2904_H_
1010
#include "soc/soc_caps.h"
11-
#if SOC_BT_SUPPORTED
11+
#if SOC_BLE_SUPPORTED
1212

1313
#include "sdkconfig.h"
1414
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -74,5 +74,5 @@ class BLE2904 : public BLEDescriptor {
7474
}; // BLE2904
7575

7676
#endif /* CONFIG_BLUEDROID_ENABLED */
77-
#endif /* SOC_BT_SUPPORTED */
77+
#endif /* SOC_BLE_SUPPORTED */
7878
#endif /* COMPONENTS_CPP_UTILS_BLE2904_H_ */

‎libraries/BLE/src/BLEAddress.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Author: kolban
66
*/
77
#include "soc/soc_caps.h"
8-
#if SOC_BT_SUPPORTED
8+
#if SOC_BLE_SUPPORTED
99

1010
#include "sdkconfig.h"
1111
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -117,4 +117,4 @@ String BLEAddress::toString() {
117117
} // toString
118118

119119
#endif
120-
#endif /* SOC_BT_SUPPORTED */
120+
#endif /* SOC_BLE_SUPPORTED */

‎libraries/BLE/src/BLEAddress.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define COMPONENTS_CPP_UTILS_BLEADDRESS_H_
1010
#include "soc/soc_caps.h"
1111
#include "WString.h"
12-
#if SOC_BT_SUPPORTED
12+
#if SOC_BLE_SUPPORTED
1313

1414
#include "sdkconfig.h"
1515
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -40,5 +40,5 @@ class BLEAddress {
4040
};
4141

4242
#endif /* CONFIG_BLUEDROID_ENABLED */
43-
#endif /* SOC_BT_SUPPORTED */
43+
#endif /* SOC_BLE_SUPPORTED */
4444
#endif /* COMPONENTS_CPP_UTILS_BLEADDRESS_H_ */

‎libraries/BLE/src/BLEAdvertisedDevice.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Author: kolban
1313
*/
1414
#include "soc/soc_caps.h"
15-
#if SOC_BT_SUPPORTED
15+
#if SOC_BLE_SUPPORTED
1616
#include "sdkconfig.h"
1717
#if defined(CONFIG_BLUEDROID_ENABLED)
1818
#include <sstream>
@@ -596,4 +596,4 @@ size_t BLEAdvertisedDevice::getPayloadLength() {
596596
}
597597

598598
#endif /* CONFIG_BLUEDROID_ENABLED */
599-
#endif /* SOC_BT_SUPPORTED */
599+
#endif /* SOC_BLE_SUPPORTED */

‎libraries/BLE/src/BLEAdvertisedDevice.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_
99
#define COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_
1010
#include "soc/soc_caps.h"
11-
#if SOC_BT_SUPPORTED
11+
#if SOC_BLE_SUPPORTED
1212

1313
#include "sdkconfig.h"
1414
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -148,5 +148,5 @@ class BLEExtAdvertisingCallbacks {
148148
#endif // SOC_BLE_50_SUPPORTED
149149

150150
#endif /* CONFIG_BLUEDROID_ENABLED */
151-
#endif /* SOC_BT_SUPPORTED */
151+
#endif /* SOC_BLE_SUPPORTED */
152152
#endif /* COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ */

‎libraries/BLE/src/BLEAdvertising.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
*/
1919
#include "soc/soc_caps.h"
20-
#if SOC_BT_SUPPORTED
20+
#if SOC_BLE_SUPPORTED
2121

2222
#include "sdkconfig.h"
2323
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -802,4 +802,4 @@ void BLEMultiAdvertising::setDuration(uint8_t instance, int duration, int max_ev
802802
#endif // SOC_BLE_50_SUPPORTED
803803

804804
#endif /* CONFIG_BLUEDROID_ENABLED */
805-
#endif /* SOC_BT_SUPPORTED */
805+
#endif /* SOC_BLE_SUPPORTED */

‎libraries/BLE/src/BLEAdvertising.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef COMPONENTS_CPP_UTILS_BLEADVERTISING_H_
99
#define COMPONENTS_CPP_UTILS_BLEADVERTISING_H_
1010
#include "soc/soc_caps.h"
11-
#if SOC_BT_SUPPORTED
11+
#if SOC_BLE_SUPPORTED
1212

1313
#include "sdkconfig.h"
1414
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -113,5 +113,5 @@ class BLEMultiAdvertising {
113113
#endif // SOC_BLE_50_SUPPORTED
114114

115115
#endif /* CONFIG_BLUEDROID_ENABLED */
116-
#endif /* SOC_BT_SUPPORTED */
116+
#endif /* SOC_BLE_SUPPORTED */
117117
#endif /* COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ */

‎libraries/BLE/src/BLEBeacon.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Author: kolban
66
*/
77
#include "soc/soc_caps.h"
8-
#if SOC_BT_SUPPORTED
8+
#if SOC_BLE_SUPPORTED
99

1010
#include "sdkconfig.h"
1111
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -81,4 +81,4 @@ void BLEBeacon::setSignalPower(int8_t signalPower) {
8181
} // setSignalPower
8282

8383
#endif
84-
#endif /* SOC_BT_SUPPORTED */
84+
#endif /* SOC_BLE_SUPPORTED */

‎libraries/BLE/src/BLEBeacon.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef COMPONENTS_CPP_UTILS_BLEBEACON_H_
99
#define COMPONENTS_CPP_UTILS_BLEBEACON_H_
1010
#include "soc/soc_caps.h"
11-
#if SOC_BT_SUPPORTED
11+
#if SOC_BLE_SUPPORTED
1212

1313
#include "BLEUUID.h"
1414
/**
@@ -44,5 +44,5 @@ class BLEBeacon {
4444
void setSignalPower(int8_t signalPower);
4545
}; // BLEBeacon
4646

47-
#endif /* SOC_BT_SUPPORTED */
47+
#endif /* SOC_BLE_SUPPORTED */
4848
#endif /* COMPONENTS_CPP_UTILS_BLEBEACON_H_ */

‎libraries/BLE/src/BLECharacteristic.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Author: kolban
66
*/
77
#include "soc/soc_caps.h"
8-
#if SOC_BT_SUPPORTED
8+
#if SOC_BLE_SUPPORTED
99

1010
#include "sdkconfig.h"
1111
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -796,4 +796,4 @@ void BLECharacteristicCallbacks::onStatus(BLECharacteristic *pCharacteristic, St
796796
} // onStatus
797797

798798
#endif /* CONFIG_BLUEDROID_ENABLED */
799-
#endif /* SOC_BT_SUPPORTED */
799+
#endif /* SOC_BLE_SUPPORTED */

‎libraries/BLE/src/BLECharacteristic.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_
99
#define COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_
1010
#include "soc/soc_caps.h"
11-
#if SOC_BT_SUPPORTED
11+
#if SOC_BLE_SUPPORTED
1212

1313
#include "sdkconfig.h"
1414
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -185,5 +185,5 @@ class BLECharacteristicCallbacks {
185185
};
186186

187187
#endif /* CONFIG_BLUEDROID_ENABLED */
188-
#endif /* SOC_BT_SUPPORTED */
188+
#endif /* SOC_BLE_SUPPORTED */
189189
#endif /* COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_ */

‎libraries/BLE/src/BLECharacteristicMap.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Author: kolban
66
*/
77
#include "soc/soc_caps.h"
8-
#if SOC_BT_SUPPORTED
8+
#if SOC_BLE_SUPPORTED
99

1010
#include "sdkconfig.h"
1111
#if defined(CONFIG_BLUEDROID_ENABLED)
@@ -131,4 +131,4 @@ String BLECharacteristicMap::toString() {
131131
} // toString
132132

133133
#endif /* CONFIG_BLUEDROID_ENABLED */
134-
#endif /* SOC_BT_SUPPORTED */
134+
#endif /* SOC_BLE_SUPPORTED */

0 commit comments

Comments
 (0)