Merge pull request #170 from Riesi/main

Fix ESP-IDF v5.4 build
taks · Feb 12, 2025 · b997654 · b997654
2 parents d2be427 + 40ffd0b
commit b997654
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/build.rs b/build.rs
@@ -8,7 +8,7 @@ fn main() {
   println!("cargo::rustc-check-cfg=cfg(esp_idf_bt_nimble_ext_adv)");
 
   println!("cargo::rustc-check-cfg=cfg(esp_idf_version_major, values(\"4\", \"5\"))");
-  println!("cargo::rustc-check-cfg=cfg(esp_idf_version_minor, values(\"2\", \"3\"))");
+  println!("cargo::rustc-check-cfg=cfg(esp_idf_version_minor, values(\"2\", \"3\", \"4\"))");
   println!("cargo::rustc-check-cfg=cfg(esp_idf_version_patch, values(\"0\"))");
   println!("cargo::rustc-check-cfg=cfg(esp_idf_version_patch, values(\"1\"))");
   println!("cargo::rustc-check-cfg=cfg(esp_idf_version_patch, values(\"2\"))");

diff --git a/src/server/ble_characteristic.rs b/src/server/ble_characteristic.rs
@@ -24,7 +24,11 @@ cfg_if::cfg_if! {
     all(
       esp_idf_version_major = "5",
       esp_idf_version_minor = "3",
-      not(any(esp_idf_version_patch = "0", esp_idf_version_patch = "1")))
+      not(any(esp_idf_version_patch = "0", esp_idf_version_patch = "1"))),
+    all(
+      esp_idf_version_major = "5",
+      esp_idf_version_minor = "4",
+      esp_idf_version_patch = "0"),
   ))] {
     type NotifyTxType = sys::ble_gap_event__bindgen_ty_1__bindgen_ty_12;
     type Subscribe = sys::ble_gap_event__bindgen_ty_1__bindgen_ty_13;