Skip to content

Commit b115ace

Browse files
me-no-devlucasssvaz
me-no-dev
and
lucasssvaz
authored
IDF master (#11289)
* fix(libs): Ensure compilation with ESP32-C5 * fix(i2c): Update I2C Slave init call * IDF master 465b159c * ci(simple_ble): Add check for BLE supported * IDF master 38628f98 --------- Co-authored-by: Lucas Saavedra Vaz <[email protected]>
1 parent c9efce6 commit b115ace

14 files changed

+80
-55
lines changed

‎cores/esp32/esp32-hal-i2c-slave.c

+7
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include "soc/i2c_struct.h"
4444
#include "soc/periph_defs.h"
4545
#include "hal/i2c_ll.h"
46+
#include "hal/i2c_types.h"
4647
#ifndef CONFIG_IDF_TARGET_ESP32C5
4748
#include "hal/clk_gate_ll.h"
4849
#endif
@@ -337,7 +338,13 @@ esp_err_t i2cSlaveInit(uint8_t num, int sda, int scl, uint16_t slaveID, uint32_t
337338
}
338339
#endif // !defined(CONFIG_IDF_TARGET_ESP32P4)
339340

341+
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
342+
i2c_ll_set_mode(i2c->dev, I2C_BUS_MODE_SLAVE);
343+
i2c_ll_enable_pins_open_drain(i2c->dev, true);
344+
#else
340345
i2c_ll_slave_init(i2c->dev);
346+
#endif
347+
341348
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
342349
i2c_ll_enable_fifo_mode(i2c->dev, true);
343350
#else

‎idf_component.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ dependencies:
5757
version: "==1.6.3"
5858
require: public
5959
rules:
60-
- if: "target not in [esp32c2, esp32p4]"
60+
- if: "target not in [esp32c2, esp32p4, esp32c5]"
6161
espressif/esp-zigbee-lib:
6262
version: "==1.6.3"
6363
require: public
6464
rules:
65-
- if: "target not in [esp32c2, esp32p4]"
65+
- if: "target not in [esp32c2, esp32p4, esp32c5]"
6666
espressif/esp-dsp:
6767
version: "^1.3.4"
6868
rules:
@@ -73,32 +73,32 @@ dependencies:
7373
espressif/esp_rainmaker:
7474
version: "1.5.2"
7575
rules:
76-
- if: "target not in [esp32c2, esp32p4]"
76+
- if: "target not in [esp32c2, esp32p4, esp32c5]"
7777
espressif/rmaker_common:
7878
version: "1.4.6"
7979
rules:
80-
- if: "target not in [esp32c2, esp32p4]"
80+
- if: "target not in [esp32c2, esp32p4, esp32c5]"
8181
espressif/esp_insights:
8282
version: "1.2.2"
8383
rules:
84-
- if: "target not in [esp32c2, esp32p4]"
84+
- if: "target not in [esp32c2, esp32p4, esp32c5]"
8585
# New version breaks esp_insights 1.0.1
8686
espressif/esp_diag_data_store:
8787
version: "1.0.2"
8888
rules:
89-
- if: "target not in [esp32c2, esp32p4]"
89+
- if: "target not in [esp32c2, esp32p4, esp32c5]"
9090
espressif/esp_diagnostics:
9191
version: "1.2.1"
9292
rules:
93-
- if: "target not in [esp32c2, esp32p4]"
93+
- if: "target not in [esp32c2, esp32p4, esp32c5]"
9494
espressif/cbor:
9595
version: "0.6.0~1"
9696
rules:
97-
- if: "target not in [esp32c2, esp32p4]"
97+
- if: "target not in [esp32c2, esp32p4, esp32c5]"
9898
espressif/qrcode:
9999
version: "0.1.0~2"
100100
rules:
101-
- if: "target not in [esp32c2, esp32p4]"
101+
- if: "target not in [esp32c2, esp32p4, esp32c5]"
102102
# RainMaker End
103103
espressif/esp-sr:
104104
version: "^1.4.2"

‎libraries/BluetoothSerial/src/BTAddress.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* Author: Thomas M. (ArcticSnowSky)
88
*/
99
#include "sdkconfig.h"
10-
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
10+
#include "soc/soc_caps.h"
11+
12+
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
1113

1214
#include "BTAddress.h"
1315
#include <string>

‎libraries/BluetoothSerial/src/BTAddress.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
#ifndef COMPONENTS_CPP_UTILS_BTADDRESS_H_
1111
#define COMPONENTS_CPP_UTILS_BTADDRESS_H_
1212
#include "sdkconfig.h"
13-
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
13+
#include "soc/soc_caps.h"
14+
15+
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
1416
#include <esp_gap_bt_api.h> // ESP32 BT
1517
#include <Arduino.h>
1618

‎libraries/BluetoothSerial/src/BTAdvertisedDevice.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* Author: Thomas M. (ArcticSnowSky)
66
*/
77

8-
#ifndef __BTADVERTISEDDEVICE_H__
9-
#define __BTADVERTISEDDEVICE_H__
8+
#pragma once
9+
#include "sdkconfig.h"
10+
#include "soc/soc_caps.h"
1011

12+
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
1113
#include "BTAddress.h"
1214
#include <string>
1315

‎libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
*/
77

88
#include "sdkconfig.h"
9-
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
9+
#include "soc/soc_caps.h"
10+
11+
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
1012

1113
//#include <map>
1214

‎libraries/BluetoothSerial/src/BTScan.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
* Author: Thomas M. (ArcticSnowSky)
66
*/
77

8-
#ifndef __BTSCAN_H__
9-
#define __BTSCAN_H__
8+
#pragma once
9+
#include "sdkconfig.h"
10+
#include "soc/soc_caps.h"
11+
12+
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
1013

1114
#include <map>
1215
#include <string>

‎libraries/BluetoothSerial/src/BTScanResultsSet.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
*/
77

88
#include "sdkconfig.h"
9-
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
9+
#include "soc/soc_caps.h"
10+
11+
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
1012

1113
#include <esp_err.h>
1214

‎libraries/BluetoothSerial/src/BluetoothSerial.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
#include <cstring>
2020
#include "freertos/FreeRTOS.h"
2121
#include "freertos/task.h"
22+
#include "soc/soc_caps.h"
2223

23-
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
24+
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
2425

2526
#ifdef ARDUINO_ARCH_ESP32
2627
#include "esp32-hal-log.h"

‎libraries/BluetoothSerial/src/BluetoothSerial.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
#define _BLUETOOTH_SERIAL_H_
1717

1818
#include "sdkconfig.h"
19+
#include "soc/soc_caps.h"
1920

20-
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
21+
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
2122

2223
#include "Arduino.h"
2324
#include "Stream.h"

‎libraries/SimpleBLE/examples/SimpleBleDevice/ci.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"requires": [
3+
"CONFIG_SOC_BLE_SUPPORTED=y",
34
"CONFIG_BT_ENABLED=y",
45
"CONFIG_BLUEDROID_ENABLED=y"
56
]

‎libraries/SimpleBLE/src/SimpleBLE.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
// limitations under the License.
1414

1515
#include "sdkconfig.h"
16+
#include "soc/soc_caps.h"
1617

17-
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
18+
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
1819

1920
#include "SimpleBLE.h"
2021
#include "esp32-hal-log.h"

‎libraries/SimpleBLE/src/SimpleBLE.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
#define _SIMPLE_BLE_H_
1717

1818
#include "sdkconfig.h"
19+
#include "soc/soc_caps.h"
1920

20-
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
21+
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
2122

2223
#include <cstdint>
2324
#include <cstdio>

‎package/package_esp32_index.template.json

+34-34
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
{
5252
"packager": "esp32",
5353
"name": "esp32-arduino-libs",
54-
"version": "idf-master-d930a386-v1"
54+
"version": "idf-master-38628f98-v1"
5555
},
5656
{
5757
"packager": "esp32",
@@ -104,63 +104,63 @@
104104
"tools": [
105105
{
106106
"name": "esp32-arduino-libs",
107-
"version": "idf-master-d930a386-v1",
107+
"version": "idf-master-38628f98-v1",
108108
"systems": [
109109
{
110110
"host": "i686-mingw32",
111-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip",
112-
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip",
113-
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae",
114-
"size": "422376381"
111+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
112+
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
113+
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
114+
"size": "398323971"
115115
},
116116
{
117117
"host": "x86_64-mingw32",
118-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip",
119-
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip",
120-
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae",
121-
"size": "422376381"
118+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
119+
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
120+
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
121+
"size": "398323971"
122122
},
123123
{
124124
"host": "arm64-apple-darwin",
125-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip",
126-
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip",
127-
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae",
128-
"size": "422376381"
125+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
126+
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
127+
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
128+
"size": "398323971"
129129
},
130130
{
131131
"host": "x86_64-apple-darwin",
132-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip",
133-
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip",
134-
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae",
135-
"size": "422376381"
132+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
133+
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
134+
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
135+
"size": "398323971"
136136
},
137137
{
138138
"host": "x86_64-pc-linux-gnu",
139-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip",
140-
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip",
141-
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae",
142-
"size": "422376381"
139+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
140+
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
141+
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
142+
"size": "398323971"
143143
},
144144
{
145145
"host": "i686-pc-linux-gnu",
146-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip",
147-
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip",
148-
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae",
149-
"size": "422376381"
146+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
147+
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
148+
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
149+
"size": "398323971"
150150
},
151151
{
152152
"host": "aarch64-linux-gnu",
153-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip",
154-
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip",
155-
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae",
156-
"size": "422376381"
153+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
154+
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
155+
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
156+
"size": "398323971"
157157
},
158158
{
159159
"host": "arm-linux-gnueabihf",
160-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip",
161-
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip",
162-
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae",
163-
"size": "422376381"
160+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
161+
"archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
162+
"checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
163+
"size": "398323971"
164164
}
165165
]
166166
},

0 commit comments

Comments
 (0)