Compatibility with ESP-IDF 5.4.x, 5.5.x and master

Author: ivmarkov

.cargo/config.toml

@@ -25,7 +25,7 @@ rustflags = ["--cfg", "espidf_time64"]
 
 [env]
 ESP_IDF_SDKCONFIG_DEFAULTS = ".github/configs/sdkconfig.defaults"
-ESP_IDF_VERSION = "v5.3.2"
+ESP_IDF_VERSION = "v5.4.2"
 #ESP_IDF_VERSION = "release/v5.3" Necessary for `Thread::stop`
 
 [unstable]

.github/workflows/ci-esp-idf-next.yml

@@ -25,9 +25,6 @@ jobs:
           - xtensa-esp32s2-espidf
           - xtensa-esp32s3-espidf
         idf-version:
-          - release/v5.3
-          - release/v5.4
-          - release/v5.5
           - master
     steps:
       - name: Setup | Checkout

.github/workflows/ci.yml

@@ -27,10 +27,11 @@ jobs:
           - xtensa-esp32s2-espidf
           - xtensa-esp32s3-espidf
         idf-version:
-          - v4.4.8
-          - v5.1.2
-          - v5.2.3
-          - v5.3.2
+          - release/v5.1
+          - release/v5.2
+          - release/v5.3
+          - release/v5.4
+          - release/v5.5
     steps:
       - name: Setup | Checkout
         uses: actions/checkout@v3

CHANGELOG.md

@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Thread support is no longer behind the `experimental` feature
 
 ### Added
+- Compatibility with ESP-IDF V5.4.x and V5.5.x
 - Logging configuration enhanced with a simpler setup where Rust logs can be configured to have a verbosity which is
   disconnected from the verbosity of the ESP-IDF native C logging (#593)
 - OTA: New method - `EspFirmwareInfoLoad::fetch_native` - returning the full native ESP-IDF image descriptor structures

Cargo.toml

@@ -17,7 +17,7 @@ rust-version = "1.82"
 
 [patch.crates-io]
 esp-idf-sys = { git = "https://github.com/esp-rs/esp-idf-sys" }
-esp-idf-hal = { git = "https://github.com/esp-rs/esp-idf-hal" }
+esp-idf-hal = { git = "https://github.com/esp-rs/esp-idf-hal", branch = "new-esp-idf-vers-compat" }
 
 [lib]
 harness = false

src/espnow.rs

@@ -218,8 +218,16 @@ impl<'a> EspNow<'a> {
         Ok(())
     }
 
-    extern "C" fn send_callback(mac_addr: *const u8, status: esp_now_send_status_t) {
-        let c_mac = unsafe { core::slice::from_raw_parts(mac_addr, 6usize) };
+    extern "C" fn send_callback(
+        #[cfg(esp_idf_version_at_least_5_5_0)] tx_info: *const esp_now_send_info_t,
+        #[cfg(not(esp_idf_version_at_least_5_5_0))] dst_addr: *const u8,
+        status: esp_now_send_status_t,
+    ) {
+        #[cfg(esp_idf_version_at_least_5_5_0)]
+        let c_mac = unsafe { core::slice::from_raw_parts((*tx_info).des_addr, 6usize) };
+
+        #[cfg(not(esp_idf_version_at_least_5_5_0))]
+        let c_mac = unsafe { core::slice::from_raw_parts(dst_addr, 6usize) };
 
         if let Some(ref mut callback) = *SEND_CALLBACK.lock() {
             callback(c_mac, status.into())

src/http/client.rs

@@ -141,7 +141,16 @@ impl EspHttpConnection {
         if let (Some(cert), Some(private_key)) =
             (configuration.client_certificate, configuration.private_key)
         {
-            native_config.client_cert_pem = cert.as_esp_idf_raw_ptr() as _;
+            #[cfg(esp_idf_version_at_least_5_5_0)]
+            {
+                native_config.__bindgen_anon_2.client_cert_pem = cert.as_esp_idf_raw_ptr() as _;
+            }
+
+            #[cfg(not(esp_idf_version_at_least_5_5_0))]
+            {
+                native_config.client_cert_pem = cert.as_esp_idf_raw_ptr() as _;
+            }
+
             native_config.client_cert_len = cert.as_esp_idf_raw_len();
 
             native_config.client_key_pem = private_key.as_esp_idf_raw_ptr() as _;

src/thread.rs

@@ -1192,25 +1192,15 @@ where
             }
 
             #[allow(unused_mut)]
+            #[allow(unused_assignments)]
             let mut stop_supported = false;
 
             #[cfg(any(
-                not(any(esp_idf_version_major = "4", esp_idf_version_major = "5")),
-                all(
-                    esp_idf_version_major = "5",
-                    not(any(
-                        esp_idf_version = "5.0",
-                        esp_idf_version = "5.1",
-                        esp_idf_version = "5.2",
-                        esp_idf_version_full = "5.3.0",
-                        esp_idf_version_full = "5.3.1",
-                        esp_idf_version_full = "5.3.2",
-                        esp_idf_version_full = "5.3.3",
-                        esp_idf_version_full = "5.4.0",
-                        esp_idf_version_full = "5.4.1",
-                        esp_idf_version_full = "5.4.2",
-                    ))
-                )
+                esp_idf_version_at_least_5_5_0,
+                all(esp_idf_version = "5.1", esp_idf_version_at_least_5_1_7),
+                all(esp_idf_version = "5.2", esp_idf_version_at_least_5_2_6),
+                all(esp_idf_version = "5.3", esp_idf_version_at_least_5_3_4),
+                all(esp_idf_version = "5.4", esp_idf_version_at_least_5_4_3)
             ))]
             {
                 unsafe {