Remove integrated-timer references

esp-rs · Dec 17, 2024 · 32ccce2 · 32ccce2
1 parent 7cac5ac
commit 32ccce2
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 11 deletions.
diff --git a/esp-hal-embassy/Cargo.toml b/esp-hal-embassy/Cargo.toml
@@ -53,7 +53,7 @@ executors = ["dep:embassy-executor", "esp-hal/__esp_hal_embassy"]
 ## provides an executor-integrated timer queue which does not need a set capacity.
 generic-queue = ["embassy-time-queue-driver/_generic-queue"]
 ## Use a single, global timer queue. This option only needs a single alarm, no matter how many
-## executors are used. Ignored if `integrated-timers` is not set.
+## executors are used. Ignored if `generic-queue` is set.
 single-queue = []
 
 [lints.rust]

diff --git a/esp-hal-embassy/src/lib.rs b/esp-hal-embassy/src/lib.rs
@@ -143,7 +143,7 @@ impl_array!(4);
 /// - A mutable static array of `OneShotTimer` instances
 /// - A 2, 3, 4 element array of `AnyTimer` instances
 ///
-/// Note that if you use the `integrated-timers` feature,
+/// Note that unless you use the `generic-queue` or the `single-queue` feature,
 /// you need to pass as many timers as you start executors.
 ///
 /// # Examples

diff --git a/esp-hal-embassy/src/time_driver.rs b/esp-hal-embassy/src/time_driver.rs
@@ -222,7 +222,7 @@ impl EmbassyTimer {
     pub(crate) fn set_alarm(&self, alarm: AlarmHandle, timestamp: u64) -> bool {
         let alarm = &self.alarms[alarm.id];
 
-        // If `embassy-executor/integrated-timers` is enabled and there are no pending
+        // If integrated timers are used and there are no pending
         // timers, embassy still calls `set_alarm` with `u64::MAX`. By returning
         // `true` we signal that no re-polling is necessary.
         if timestamp == u64::MAX {

diff --git a/examples/src/bin/embassy_hello_world.rs b/examples/src/bin/embassy_hello_world.rs
@@ -4,7 +4,7 @@
 //! concurrently.
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: embassy esp-hal-embassy/integrated-timers esp-hal/unstable
+//% FEATURES: embassy esp-hal/unstable
 
 #![no_std]
 #![no_main]

diff --git a/examples/src/bin/embassy_multiprio.rs b/examples/src/bin/embassy_multiprio.rs
@@ -15,7 +15,7 @@
 // The interrupt-executor is created in `main` and is used to spawn `high_prio`.
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: embassy esp-hal-embassy/log esp-hal-embassy/integrated-timers esp-hal/unstable
+//% FEATURES: embassy esp-hal-embassy/log esp-hal/unstable
 
 #![no_std]
 #![no_main]

diff --git a/hil-test/Cargo.toml b/hil-test/Cargo.toml
@@ -290,7 +290,6 @@ embassy = [
     "embedded-test/external-executor",
     "dep:esp-hal-embassy",
 ]
-integrated-timers = ["esp-hal-embassy?/integrated-timers"]
 octal-psram = ["esp-hal/octal-psram", "esp-alloc"]
 
 # https://doc.rust-lang.org/cargo/reference/profiles.html#test

diff --git a/hil-test/tests/embassy_interrupt_executor.rs b/hil-test/tests/embassy_interrupt_executor.rs
@@ -2,8 +2,9 @@
 //! code.
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: integrated-timers
 //% FEATURES:
+//% FEATURES: esp-hal-embassy/single-queue
+//% FEATURES: esp-hal-embassy/generic-queue
 
 #![no_std]
 #![no_main]

diff --git a/hil-test/tests/embassy_interrupt_spi_dma.rs b/hil-test/tests/embassy_interrupt_spi_dma.rs
@@ -1,8 +1,9 @@
 //! Reproduction and regression test for a sneaky issue.
 
 //% CHIPS: esp32 esp32s2 esp32s3 esp32c3 esp32c6 esp32h2
-//% FEATURES: integrated-timers
 //% FEATURES:
+//% FEATURES: esp-hal-embassy/single-queue
+//% FEATURES: esp-hal-embassy/generic-queue
 
 #![no_std]
 #![no_main]

diff --git a/hil-test/tests/embassy_timers_executors.rs b/hil-test/tests/embassy_timers_executors.rs
@@ -1,8 +1,9 @@
 //! Embassy timer and executor Test
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: integrated-timers
 //% FEATURES:
+//% FEATURES: esp-hal-embassy/single-queue
+//% FEATURES: esp-hal-embassy/generic-queue
 
 #![no_std]
 #![no_main]

diff --git a/hil-test/tests/gpio_custom_handler.rs b/hil-test/tests/gpio_custom_handler.rs
@@ -6,7 +6,9 @@
 //! async API works for user handlers automatically.
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: integrated-timers
+//% FEATURES:
+//% FEATURES: esp-hal-embassy/single-queue
+//% FEATURES: esp-hal-embassy/generic-queue
 
 #![no_std]
 #![no_main]

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -644,7 +644,7 @@ fn lint_packages(workspace: &Path, args: LintPackagesArgs) -> Result<()> {
                         &[
                             "-Zbuild-std=core",
                             &format!("--target={}", chip.target()),
-                            &format!("--features={chip},executors,defmt,integrated-timers,esp-hal/unstable"),
+                            &format!("--features={chip},executors,defmt,esp-hal/unstable"),
                         ],
                         args.fix,
                     )?;