adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

IDF master (#11289)

Browse source 
* 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 <32426024+lucasssvaz@users.noreply.github.com>
This commit is contained in:
Me No Dev 2025-05-01 02:15:03 +03:00 committed by GitHub
parent c9efce6342
commit b115acea40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 80 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cores/esp32/esp32-hal-i2c-slave.c
View file

@ -43,6 +43,7 @@
#include "soc/i2c_struct.h" #include "soc/i2c_struct.h"
#include "soc/periph_defs.h" #include "soc/periph_defs.h"
#include "hal/i2c_ll.h" #include "hal/i2c_ll.h"
#include "hal/i2c_types.h"
#ifndef CONFIG_IDF_TARGET_ESP32C5 #ifndef CONFIG_IDF_TARGET_ESP32C5
#include "hal/clk_gate_ll.h" #include "hal/clk_gate_ll.h"
#endif #endif
@ -337,7 +338,13 @@ esp_err_t i2cSlaveInit(uint8_t num, int sda, int scl, uint16_t slaveID, uint32_t
} }
#endif // !defined(CONFIG_IDF_TARGET_ESP32P4) #endif // !defined(CONFIG_IDF_TARGET_ESP32P4)
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
i2c_ll_set_mode(i2c->dev, I2C_BUS_MODE_SLAVE);
i2c_ll_enable_pins_open_drain(i2c->dev, true);
#else
i2c_ll_slave_init(i2c->dev); i2c_ll_slave_init(i2c->dev);
#endif
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0) #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
i2c_ll_enable_fifo_mode(i2c->dev, true); i2c_ll_enable_fifo_mode(i2c->dev, true);
#else #else

18
idf_component.yml
View file

@ -57,12 +57,12 @@ dependencies:
version: "==1.6.3" version: "==1.6.3"
require: public require: public
rules: rules:
- if: "target not in [esp32c2, esp32p4]" - if: "target not in [esp32c2, esp32p4, esp32c5]"
espressif/esp-zigbee-lib: espressif/esp-zigbee-lib:
version: "==1.6.3" version: "==1.6.3"
require: public require: public
rules: rules:
- if: "target not in [esp32c2, esp32p4]" - if: "target not in [esp32c2, esp32p4, esp32c5]"
espressif/esp-dsp: espressif/esp-dsp:
version: "^1.3.4" version: "^1.3.4"
rules: rules:
@ -73,32 +73,32 @@ dependencies:
espressif/esp_rainmaker: espressif/esp_rainmaker:
version: "1.5.2" version: "1.5.2"
rules: rules:
- if: "target not in [esp32c2, esp32p4]" - if: "target not in [esp32c2, esp32p4, esp32c5]"
espressif/rmaker_common: espressif/rmaker_common:
version: "1.4.6" version: "1.4.6"
rules: rules:
- if: "target not in [esp32c2, esp32p4]" - if: "target not in [esp32c2, esp32p4, esp32c5]"
espressif/esp_insights: espressif/esp_insights:
version: "1.2.2" version: "1.2.2"
rules: rules:
- if: "target not in [esp32c2, esp32p4]" - if: "target not in [esp32c2, esp32p4, esp32c5]"
# New version breaks esp_insights 1.0.1 # New version breaks esp_insights 1.0.1
espressif/esp_diag_data_store: espressif/esp_diag_data_store:
version: "1.0.2" version: "1.0.2"
rules: rules:
- if: "target not in [esp32c2, esp32p4]" - if: "target not in [esp32c2, esp32p4, esp32c5]"
espressif/esp_diagnostics: espressif/esp_diagnostics:
version: "1.2.1" version: "1.2.1"
rules: rules:
- if: "target not in [esp32c2, esp32p4]" - if: "target not in [esp32c2, esp32p4, esp32c5]"
espressif/cbor: espressif/cbor:
version: "0.6.0~1" version: "0.6.0~1"
rules: rules:
- if: "target not in [esp32c2, esp32p4]" - if: "target not in [esp32c2, esp32p4, esp32c5]"
espressif/qrcode: espressif/qrcode:
version: "0.1.0~2" version: "0.1.0~2"
rules: rules:
- if: "target not in [esp32c2, esp32p4]" - if: "target not in [esp32c2, esp32p4, esp32c5]"
# RainMaker End # RainMaker End
espressif/esp-sr: espressif/esp-sr:
version: "^1.4.2" version: "^1.4.2"

4
libraries/BluetoothSerial/src/BTAddress.cpp
View file

@ -7,7 +7,9 @@
* Author: Thomas M. (ArcticSnowSky) * Author: Thomas M. (ArcticSnowSky)
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) #include "soc/soc_caps.h"
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
#include "BTAddress.h" #include "BTAddress.h"
#include <string> #include <string>

4
libraries/BluetoothSerial/src/BTAddress.h
View file

@ -10,7 +10,9 @@
#ifndef COMPONENTS_CPP_UTILS_BTADDRESS_H_ #ifndef COMPONENTS_CPP_UTILS_BTADDRESS_H_
#define COMPONENTS_CPP_UTILS_BTADDRESS_H_ #define COMPONENTS_CPP_UTILS_BTADDRESS_H_
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) #include "soc/soc_caps.h"
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
#include <esp_gap_bt_api.h> // ESP32 BT #include <esp_gap_bt_api.h> // ESP32 BT
#include <Arduino.h> #include <Arduino.h>

6
libraries/BluetoothSerial/src/BTAdvertisedDevice.h
View file

@ -5,9 +5,11 @@
* Author: Thomas M. (ArcticSnowSky) * Author: Thomas M. (ArcticSnowSky)
*/ */
#ifndef __BTADVERTISEDDEVICE_H__ #pragma once
#define __BTADVERTISEDDEVICE_H__ #include "sdkconfig.h"
#include "soc/soc_caps.h"
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
#include "BTAddress.h" #include "BTAddress.h"
#include <string> #include <string>

4
libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp
View file

@ -6,7 +6,9 @@
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) #include "soc/soc_caps.h"
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
//#include <map> //#include <map>

7
libraries/BluetoothSerial/src/BTScan.h
View file

@ -5,8 +5,11 @@
* Author: Thomas M. (ArcticSnowSky) * Author: Thomas M. (ArcticSnowSky)
*/ */
#ifndef __BTSCAN_H__ #pragma once
#define __BTSCAN_H__ #include "sdkconfig.h"
#include "soc/soc_caps.h"
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
#include <map> #include <map>
#include <string> #include <string>

4
libraries/BluetoothSerial/src/BTScanResultsSet.cpp
View file

@ -6,7 +6,9 @@
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) #include "soc/soc_caps.h"
#if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
#include <esp_err.h> #include <esp_err.h>

3
libraries/BluetoothSerial/src/BluetoothSerial.cpp
View file

@ -19,8 +19,9 @@
#include <cstring> #include <cstring>
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "soc/soc_caps.h"
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) #if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#include "esp32-hal-log.h" #include "esp32-hal-log.h"

3
libraries/BluetoothSerial/src/BluetoothSerial.h
View file

@ -16,8 +16,9 @@
#define _BLUETOOTH_SERIAL_H_ #define _BLUETOOTH_SERIAL_H_
#include "sdkconfig.h" #include "sdkconfig.h"
#include "soc/soc_caps.h"
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) #if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
#include "Arduino.h" #include "Arduino.h"
#include "Stream.h" #include "Stream.h"

1
libraries/SimpleBLE/examples/SimpleBleDevice/ci.json
View file

@ -1,5 +1,6 @@
{ {
"requires": [ "requires": [
"CONFIG_SOC_BLE_SUPPORTED=y",
"CONFIG_BT_ENABLED=y", "CONFIG_BT_ENABLED=y",
"CONFIG_BLUEDROID_ENABLED=y" "CONFIG_BLUEDROID_ENABLED=y"
] ]

3
libraries/SimpleBLE/src/SimpleBLE.cpp
View file

@ -13,8 +13,9 @@
// limitations under the License. // limitations under the License.
#include "sdkconfig.h" #include "sdkconfig.h"
#include "soc/soc_caps.h"
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) #if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
#include "SimpleBLE.h" #include "SimpleBLE.h"
#include "esp32-hal-log.h" #include "esp32-hal-log.h"

3
libraries/SimpleBLE/src/SimpleBLE.h
View file

@ -16,8 +16,9 @@
#define _SIMPLE_BLE_H_ #define _SIMPLE_BLE_H_
#include "sdkconfig.h" #include "sdkconfig.h"
#include "soc/soc_caps.h"
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) #if SOC_BT_SUPPORTED && defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
#include <cstdint> #include <cstdint>
#include <cstdio> #include <cstdio>

68
package/package_esp32_index.template.json
View file

@ -51,7 +51,7 @@
{ {
"packager": "esp32", "packager": "esp32",
"name": "esp32-arduino-libs", "name": "esp32-arduino-libs",
"version": "idf-master-d930a386-v1" "version": "idf-master-38628f98-v1"
}, },
{ {
"packager": "esp32", "packager": "esp32",
@ -104,63 +104,63 @@
"tools": [ "tools": [
{ {
"name": "esp32-arduino-libs", "name": "esp32-arduino-libs",
"version": "idf-master-d930a386-v1", "version": "idf-master-38628f98-v1",
"systems": [ "systems": [
{ {
"host": "i686-mingw32", "host": "i686-mingw32",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae", "checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
"size": "422376381" "size": "398323971"
}, },
{ {
"host": "x86_64-mingw32", "host": "x86_64-mingw32",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae", "checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
"size": "422376381" "size": "398323971"
}, },
{ {
"host": "arm64-apple-darwin", "host": "arm64-apple-darwin",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae", "checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
"size": "422376381" "size": "398323971"
}, },
{ {
"host": "x86_64-apple-darwin", "host": "x86_64-apple-darwin",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae", "checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
"size": "422376381" "size": "398323971"
}, },
{ {
"host": "x86_64-pc-linux-gnu", "host": "x86_64-pc-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae", "checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
"size": "422376381" "size": "398323971"
}, },
{ {
"host": "i686-pc-linux-gnu", "host": "i686-pc-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae", "checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
"size": "422376381" "size": "398323971"
}, },
{ {
"host": "aarch64-linux-gnu", "host": "aarch64-linux-gnu",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae", "checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
"size": "422376381" "size": "398323971"
}, },
{ {
"host": "arm-linux-gnueabihf", "host": "arm-linux-gnueabihf",
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-d930a386-v1.zip", "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-master/esp32-arduino-libs-idf-master-38628f98-v1.zip",
"archiveFileName": "esp32-arduino-libs-idf-master-d930a386-v1.zip", "archiveFileName": "esp32-arduino-libs-idf-master-38628f98-v1.zip",
"checksum": "SHA-256:0310daa4f08f807f2bf3babd2587c2694df64c70e367863eadf5020636b717ae", "checksum": "SHA-256:efc30a38cccff38c36a86fd3db78aeb13594da60ccf49bc7971b7a9f849abcdf",
"size": "422376381" "size": "398323971"
} }
] ]
}, },