Skip to content

Commit 941a6c9

Browse files
lucasssvazlucasssvaz
committed
Fix includes
1 parent 9e883e5 commit 941a6c9

File tree

86 files changed

+187
-87
lines changed

Some content is hidden

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

86 files changed

+187
-87
lines changed

Diff for: ‎libraries/BLE/src/BLE2901.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "soc/soc_caps.h"
1919
#if SOC_BLE_SUPPORTED
2020

21-
#include "sdkconfig.h"
21+
#include "btconfig.h"
2222
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
2323

2424
#include "BLE2901.h"

Diff for: ‎libraries/BLE/src/BLE2901.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "soc/soc_caps.h"
2222
#if SOC_BLE_SUPPORTED
2323

24-
#include "sdkconfig.h"
24+
#include "btconfig.h"
2525
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
2626

2727
#include "BLEDescriptor.h"

Diff for: ‎libraries/BLE/src/BLE2902.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "soc/soc_caps.h"
1313
#if SOC_BLE_SUPPORTED
1414

15-
#include "sdkconfig.h"
15+
#include "btconfig.h"
1616
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
1717

1818
#include "BLE2902.h"

Diff for: ‎libraries/BLE/src/BLE2902.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "soc/soc_caps.h"
1111
#if SOC_BLE_SUPPORTED
1212

13-
#include "sdkconfig.h"
13+
#include "btconfig.h"
1414
#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
1515

1616
#include "BLEDescriptor.h"

Diff for: ‎libraries/BLE/src/BLE2904.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_BLUEDROID_ENABLED) || (defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL))
2525

2626
#include "BLEDescriptor.h"

Diff for: ‎libraries/BLE/src/BLEAddress.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "WString.h"
2222
#if SOC_BLE_SUPPORTED
2323

24-
#include "sdkconfig.h"
24+
#include "btconfig.h"
2525
#if defined(CONFIG_NIMBLE_ENABLED)
2626

2727
#include "nimble/ble.h"

Diff for: ‎libraries/BLE/src/BLEAdvertisedDevice.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
2525

2626
#include "BLEAddress.h"

Diff for: ‎libraries/BLE/src/BLEAdvertisementData.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef NIMBLE_CPP_ADVERTISEMENT_DATA_H_
1919
#define NIMBLE_CPP_ADVERTISEMENT_DATA_H_
2020

21-
#include "sdkconfig.h"
21+
#include "btconfig.h"
2222
#if (defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
2323

2424
#include <cstdint>

Diff for: ‎libraries/BLE/src/BLEAdvertising.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if (defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
2525

2626
#include "host/ble_gap.h"

Diff for: ‎libraries/BLE/src/BLEAttValue.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#ifndef NIMBLE_CPP_ATTVALUE_H
1919
#define NIMBLE_CPP_ATTVALUE_H
20-
#include "sdkconfig.h"
20+
#include "btconfig.h"
2121
#if defined(CONFIG_NIMBLE_ENABLED)
2222

2323
#include <Arduino.h>

Diff for: ‎libraries/BLE/src/BLEAttribute.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef NIMBLE_CPP_ATTRIBUTE_H_
1919
#define NIMBLE_CPP_ATTRIBUTE_H_
2020

21-
#include "sdkconfig.h"
21+
#include "btconfig.h"
2222
#if defined(CONFIG_NIMBLE_ENABLED) && (defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL) || defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL))
2323

2424
#include "BLEUUID.h"

Diff for: ‎libraries/BLE/src/BLEBeacon.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
2525

2626
class BLEUUID;

Diff for: ‎libraries/BLE/src/BLECharacteristic.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
2525

2626
class BLECharacteristicCallbacks;

Diff for: ‎libraries/BLE/src/BLEClient.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "soc/soc_caps.h"
2222
#if SOC_BLE_SUPPORTED
2323

24-
#include "sdkconfig.h"
24+
#include "btconfig.h"
2525
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
2626

2727
#include "host/ble_gap.h"

Diff for: ‎libraries/BLE/src/BLEConnInfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef NIMBLECONNINFO_H_
1919
#define NIMBLECONNINFO_H_
2020

21-
#include "sdkconfig.h"
21+
#include "btconfig.h"
2222
#ifdef CONFIG_NIMBLE_ENABLED
2323

2424
#include "host/ble_gap.h"

Diff for: ‎libraries/BLE/src/BLEDescriptor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
2525

2626
#include "BLELocalValueAttribute.h"

Diff for: ‎libraries/BLE/src/BLEDevice.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED)
2525
#ifndef CONFIG_IDF_TARGET_ESP32P4
2626
#include <esp_bt.h>

Diff for: ‎libraries/BLE/src/BLEEddystoneTLM.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
2525

2626
class BLEUUID;

Diff for: ‎libraries/BLE/src/BLEEddystoneURL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "soc/soc_caps.h"
1414
#if SOC_BLE_SUPPORTED
1515

16-
#include "sdkconfig.h"
16+
#include "btconfig.h"
1717
#if defined(CONFIG_BLUEDROID_ENABLED)
1818

1919
#include "BLEUUID.h"

Diff for: ‎libraries/BLE/src/BLEExceptions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "soc/soc_caps.h"
1111
#if SOC_BLE_SUPPORTED
1212

13-
#include "sdkconfig.h"
13+
#include "btconfig.h"
1414

1515
#if CONFIG_CXX_EXCEPTIONS != 1
1616
#error "C++ exception handling must be enabled within make menuconfig. See Compiler Options > Enable C++ Exceptions."

Diff for: ‎libraries/BLE/src/BLEExtAdvertising.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef NIMBLE_CPP_EXTADVERTISING_H_
1919
#define NIMBLE_CPP_EXTADVERTISING_H_
2020

21-
#include "sdkconfig.h"
21+
#include "btconfig.h"
2222
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && CONFIG_BT_NIMBLE_EXT_ADV
2323

2424
#include "host/ble_gap.h"

Diff for: ‎libraries/BLE/src/BLEHIDDevice.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define HID_BARCODE 0x03C8
3333
#define HID_BRAILLE_DISPLAY 0x03C9
3434

35-
#include "sdkconfig.h"
35+
#include "btconfig.h"
3636
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
3737

3838
#include <stdint.h>

Diff for: ‎libraries/BLE/src/BLELocalAttribute.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef NIMBLE_CPP_LOCAL_ATTRIBUTE_H_
1919
#define NIMBLE_CPP_LOCAL_ATTRIBUTE_H_
2020

21-
#include "sdkconfig.h"
21+
#include "btconfig.h"
2222
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
2323

2424
#include "BLEAttribute.h"

Diff for: ‎libraries/BLE/src/BLELocalValueAttribute.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
#ifndef NIMBLE_LOCAL_VALUE_ATTRIBUTE_H_
1919
#define NIMBLE_LOCAL_VALUE_ATTRIBUTE_H_
2020

21-
#include "sdkconfig.h"
21+
#include "btconfig.h"
2222
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
2323

24+
#include "nimconfig_rename.h"
2425
#include "host/ble_hs.h"
2526

2627
/**** FIX COMPILATION ****/

Diff for: ‎libraries/BLE/src/BLERemoteCharacteristic.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
2525

2626
#include "BLERemoteValueAttribute.h"

Diff for: ‎libraries/BLE/src/BLERemoteDescriptor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
2525

2626
#include "BLERemoteValueAttribute.h"

Diff for: ‎libraries/BLE/src/BLERemoteService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
2525

2626
#include "BLEAttribute.h"

Diff for: ‎libraries/BLE/src/BLERemoteValueAttribute.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef NIMBLE_CPP_REMOTE_VALUE_ATTRIBUTE_H_
1919
#define NIMBLE_CPP_REMOTE_VALUE_ATTRIBUTE_H_
2020

21-
#include "sdkconfig.h"
21+
#include "btconfig.h"
2222
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
2323

2424
#include <host/ble_gatt.h>

Diff for: ‎libraries/BLE/src/BLEScan.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
2525

2626
#include "BLEAdvertisedDevice.h"

Diff for: ‎libraries/BLE/src/BLESecurity.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "soc/soc_caps.h"
1111
#if SOC_BLE_SUPPORTED
1212

13-
#include "sdkconfig.h"
13+
#include "btconfig.h"
1414
#if defined(CONFIG_BLUEDROID_ENABLED)
1515

1616
#include <esp_gap_ble_api.h>

Diff for: ‎libraries/BLE/src/BLEServer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
2525

2626
#include "host/ble_gap.h"

Diff for: ‎libraries/BLE/src/BLEService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "soc/soc_caps.h"
2121
#if SOC_BLE_SUPPORTED
2222

23-
#include "sdkconfig.h"
23+
#include "btconfig.h"
2424
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
2525

2626
class BLEService;

Diff for: ‎libraries/BLE/src/BLEUUID.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "WString.h"
2222
#if SOC_BLE_SUPPORTED
2323

24-
#include "sdkconfig.h"
24+
#include "btconfig.h"
2525
#if defined(CONFIG_NIMBLE_ENABLED)
2626

2727
#include "host/ble_uuid.h"

Diff for: ‎libraries/BLE/src/BLEUtils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "soc/soc_caps.h"
1111
#if SOC_BLE_SUPPORTED
1212

13-
#include "sdkconfig.h"
13+
#include "btconfig.h"
1414
#if defined(CONFIG_BLUEDROID_ENABLED)
1515
#include <esp_gattc_api.h> // ESP32 BLE
1616
#include <esp_gatts_api.h> // ESP32 BLE

Diff for: ‎libraries/BLE/src/BLEValue.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "WString.h"
1212
#if SOC_BLE_SUPPORTED
1313

14-
#include "sdkconfig.h"
14+
#include "btconfig.h"
1515
#if defined(CONFIG_BLUEDROID_ENABLED)
1616

1717
/**

Diff for: ‎libraries/BLE/src/Bluedroid2904.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "soc/soc_caps.h"
1313
#if SOC_BLE_SUPPORTED
1414

15-
#include "sdkconfig.h"
15+
#include "btconfig.h"
1616
#if defined(CONFIG_BLUEDROID_ENABLED)
1717

1818
#include "BLE2904.h"

Diff for: ‎libraries/BLE/src/BluedroidAddress.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "soc/soc_caps.h"
88
#if SOC_BLE_SUPPORTED
99

10-
#include "sdkconfig.h"
10+
#include "btconfig.h"
1111
#if defined(CONFIG_BLUEDROID_ENABLED)
1212

1313
#include "BLEAddress.h"

Diff for: ‎libraries/BLE/src/BluedroidAdvertisedDevice.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
#include "soc/soc_caps.h"
1515
#if SOC_BLE_SUPPORTED
16-
#include "sdkconfig.h"
16+
#include "btconfig.h"
1717
#if defined(CONFIG_BLUEDROID_ENABLED)
1818
#include <sstream>
1919
#include "BLEAdvertisedDevice.h"

Diff for: ‎libraries/BLE/src/BluedroidAdvertising.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "soc/soc_caps.h"
2020
#if SOC_BLE_SUPPORTED
2121

22-
#include "sdkconfig.h"
22+
#include "btconfig.h"
2323
#if defined(CONFIG_BLUEDROID_ENABLED)
2424
#include "BLEAdvertising.h"
2525
#include <esp_err.h>

Diff for: ‎libraries/BLE/src/BluedroidBeacon.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "soc/soc_caps.h"
88
#if SOC_BLE_SUPPORTED
99

10-
#include "sdkconfig.h"
10+
#include "btconfig.h"
1111
#if defined(CONFIG_BLUEDROID_ENABLED)
1212
#include "BLEBeacon.h"
1313
#include "esp32-hal-log.h"

Diff for: ‎libraries/BLE/src/BluedroidCharacteristic.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
#include "soc/soc_caps.h"
88
#if SOC_BLE_SUPPORTED
99

10-
#include "sdkconfig.h"
10+
#include "btconfig.h"
1111
#if defined(CONFIG_BLUEDROID_ENABLED)
1212
#include <sstream>
1313
#include <string.h>
1414
#include <iomanip>
1515
#include <stdlib.h>
16-
#include "sdkconfig.h"
1716
#include <esp_err.h>
1817
#include "BLECharacteristic.h"
1918
#include "BLEService.h"

Diff for: ‎libraries/BLE/src/BluedroidCharacteristicMap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "soc/soc_caps.h"
88
#if SOC_BLE_SUPPORTED
99

10-
#include "sdkconfig.h"
10+
#include "btconfig.h"
1111
#if defined(CONFIG_BLUEDROID_ENABLED)
1212
#include <sstream>
1313
#include <iomanip>

Diff for: ‎libraries/BLE/src/BluedroidClient.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "soc/soc_caps.h"
88
#if SOC_BLE_SUPPORTED
99

10-
#include "sdkconfig.h"
10+
#include "btconfig.h"
1111
#if defined(CONFIG_BLUEDROID_ENABLED)
1212
#include <esp_bt.h>
1313
#include <esp_bt_main.h>

0 commit comments

Comments
 (0)