From 7c8c69b84e09a2d0b9d464544fd32f8c0cfe9c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel=20Buga?= <bugadani@gmail.com>
Date: Mon, 6 Jan 2025 09:08:32 +0100
Subject: [PATCH] Update config separator, test the complex variant

---
 esp-hal-embassy/build.rs           | 2 +-
 esp-hal-embassy/src/timer_queue.rs | 2 +-
 hil-test/.cargo/config.toml        | 1 +
 qa-test/.cargo/config.toml         | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/esp-hal-embassy/build.rs b/esp-hal-embassy/build.rs
index 2e9de630a..780efbbe4 100644
--- a/esp-hal-embassy/build.rs
+++ b/esp-hal-embassy/build.rs
@@ -82,7 +82,7 @@ fn main() -> Result<(), Box<dyn StdError>> {
     println!("cargo:rustc-check-cfg=cfg(single_queue)");
     println!("cargo:rustc-check-cfg=cfg(generic_timers)");
 
-    match &crate_config["ESP_HAL_EMBASSY_TIMER_QUEUE"] {
+    match &crate_config["ESP_HAL_EMBASSY_CONFIG_TIMER_QUEUE"] {
         Value::String(s) if s.as_str() == "single-integrated" => {
             println!("cargo:rustc-cfg=integrated_timers");
             println!("cargo:rustc-cfg=single_queue");
diff --git a/esp-hal-embassy/src/timer_queue.rs b/esp-hal-embassy/src/timer_queue.rs
index a48ca3094..5546e3ba2 100644
--- a/esp-hal-embassy/src/timer_queue.rs
+++ b/esp-hal-embassy/src/timer_queue.rs
@@ -189,6 +189,6 @@ mod queue_impl {
 #[cfg(generic_timers)]
 mod queue_impl {
     pub(super) type RawQueue = embassy_time_queue_driver::queue_generic::ConstGenericQueue<
-        { esp_config::esp_config_int!(usize, "ESP_HAL_EMBASSY_GENERIC_QUEUE_SIZE") },
+        { esp_config::esp_config_int!(usize, "ESP_HAL_EMBASSY_CONFIG_GENERIC_QUEUE_SIZE") },
     >;
 }
diff --git a/hil-test/.cargo/config.toml b/hil-test/.cargo/config.toml
index 26eefc108..396bfba4e 100644
--- a/hil-test/.cargo/config.toml
+++ b/hil-test/.cargo/config.toml
@@ -18,6 +18,7 @@ rustflags = [
 
 [env]
 DEFMT_LOG = "info"
+ESP_HAL_EMBASSY_CONFIG_TIMER_QUEUE="multiple-integrated"
 
 [unstable]
 build-std = ["core"]
diff --git a/qa-test/.cargo/config.toml b/qa-test/.cargo/config.toml
index 8604b2d39..7552a44b0 100644
--- a/qa-test/.cargo/config.toml
+++ b/qa-test/.cargo/config.toml
@@ -28,6 +28,7 @@ rustflags = [
 
 [env]
 ESP_LOG = "info"
+ESP_HAL_EMBASSY_CONFIG_TIMER_QUEUE="multiple-integrated"
 
 [unstable]
 build-std = ["alloc", "core"]