From 43a5d8987e9f5a4c672a09fe53bfc1c3da01e5b3 Mon Sep 17 00:00:00 2001 From: bjoernQ Date: Wed, 17 Jan 2024 15:17:36 +0100 Subject: [PATCH 1/4] Fix time-driver-timg timer1 --- esp-hal-common/src/embassy/time_driver_timg.rs | 13 +++++++++---- esp32-hal/examples/embassy_hello_world.rs | 2 +- esp32-hal/examples/embassy_i2c.rs | 2 +- esp32-hal/examples/embassy_i2s_read.rs | 2 +- esp32-hal/examples/embassy_i2s_sound.rs | 2 +- esp32-hal/examples/embassy_multicore.rs | 2 +- esp32-hal/examples/embassy_multicore_interrupt.rs | 2 +- esp32-hal/examples/embassy_multiprio.rs | 7 ++----- esp32-hal/examples/embassy_rmt_rx.rs | 2 +- esp32-hal/examples/embassy_rmt_tx.rs | 2 +- esp32-hal/examples/embassy_serial.rs | 2 +- esp32-hal/examples/embassy_spi.rs | 2 +- esp32-hal/examples/embassy_wait.rs | 2 +- esp32c2-hal/examples/embassy_multiprio.rs | 2 +- esp32c2-hal/examples/embassy_serial.rs | 2 +- esp32c3-hal/examples/embassy_multiprio.rs | 2 +- esp32c3-hal/examples/embassy_serial.rs | 2 +- esp32c6-hal/examples/embassy_hello_world.rs | 2 +- esp32c6-hal/examples/embassy_i2c.rs | 2 +- esp32c6-hal/examples/embassy_multiprio.rs | 2 +- esp32c6-hal/examples/embassy_parl_io_rx.rs | 2 +- esp32c6-hal/examples/embassy_parl_io_tx.rs | 2 +- esp32c6-hal/examples/embassy_serial.rs | 2 +- esp32c6-hal/examples/embassy_spi.rs | 2 +- esp32c6-hal/examples/embassy_wait.rs | 2 +- esp32h2-hal/examples/embassy_hello_world.rs | 2 +- esp32h2-hal/examples/embassy_i2c.rs | 2 +- esp32h2-hal/examples/embassy_multiprio.rs | 2 +- esp32h2-hal/examples/embassy_parl_io_rx.rs | 2 +- esp32h2-hal/examples/embassy_parl_io_tx.rs | 2 +- esp32h2-hal/examples/embassy_serial.rs | 2 +- esp32h2-hal/examples/embassy_spi.rs | 2 +- esp32h2-hal/examples/embassy_wait.rs | 2 +- esp32s2-hal/examples/embassy_hello_world.rs | 2 +- esp32s2-hal/examples/embassy_i2c.rs | 2 +- esp32s2-hal/examples/embassy_i2s_read.rs | 2 +- esp32s2-hal/examples/embassy_i2s_sound.rs | 2 +- esp32s2-hal/examples/embassy_multiprio.rs | 2 +- esp32s2-hal/examples/embassy_rmt_rx.rs | 2 +- esp32s2-hal/examples/embassy_rmt_tx.rs | 2 +- esp32s2-hal/examples/embassy_serial.rs | 2 +- esp32s2-hal/examples/embassy_spi.rs | 2 +- esp32s2-hal/examples/embassy_wait.rs | 2 +- esp32s3-hal/examples/embassy_hello_world.rs | 2 +- esp32s3-hal/examples/embassy_i2c.rs | 2 +- esp32s3-hal/examples/embassy_multicore.rs | 2 +- esp32s3-hal/examples/embassy_multicore_interrupt.rs | 2 +- esp32s3-hal/examples/embassy_multiprio.rs | 2 +- esp32s3-hal/examples/embassy_rmt_rx.rs | 2 +- esp32s3-hal/examples/embassy_serial.rs | 2 +- esp32s3-hal/examples/embassy_spi.rs | 2 +- esp32s3-hal/examples/embassy_wait.rs | 2 +- 52 files changed, 61 insertions(+), 59 deletions(-) diff --git a/esp-hal-common/src/embassy/time_driver_timg.rs b/esp-hal-common/src/embassy/time_driver_timg.rs index 0a013a28fa1..e0df9fe8a9f 100644 --- a/esp-hal-common/src/embassy/time_driver_timg.rs +++ b/esp-hal-common/src/embassy/time_driver_timg.rs @@ -8,7 +8,7 @@ use crate::{ clock::Clocks, peripherals, prelude::*, - timer::{Instance, Timer, Timer0}, + timer::{Instance, Timer0, TimerGroup}, }; #[cfg(not(any(esp32, esp32s2, esp32s3)))] @@ -16,7 +16,7 @@ pub const ALARM_COUNT: usize = 1; #[cfg(any(esp32, esp32s2, esp32s3))] pub const ALARM_COUNT: usize = 2; -pub type TimerType = Timer>; +pub type TimerType = TimerGroup<'static, TIMG0>; pub struct EmbassyTimer { pub(crate) alarms: Mutex<[AlarmState; ALARM_COUNT]>, @@ -56,9 +56,14 @@ impl EmbassyTimer { // set divider to get a 1mhz clock. APB (80mhz) / 80 = 1mhz... // TODO: assert APB clock is the source and its at the correct speed for the // divider - timer.set_divider(clocks.apb_clock.to_MHz() as u16); + timer.timer0.set_divider(clocks.apb_clock.to_MHz() as u16); + timer.timer0.set_counter_active(true); - timer.set_counter_active(true); + #[cfg(any(esp32, esp32s2, esp32s3))] + { + timer.timer1.set_divider(clocks.apb_clock.to_MHz() as u16); + timer.timer1.set_counter_active(true); + } unwrap!(interrupt::enable( peripherals::Interrupt::TG0_T0_LEVEL, diff --git a/esp32-hal/examples/embassy_hello_world.rs b/esp32-hal/examples/embassy_hello_world.rs index 0eaacb66f4d..841c65713dd 100644 --- a/esp32-hal/examples/embassy_hello_world.rs +++ b/esp32-hal/examples/embassy_hello_world.rs @@ -34,7 +34,7 @@ async fn main(spawner: Spawner) { let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); spawner.spawn(run()).ok(); diff --git a/esp32-hal/examples/embassy_i2c.rs b/esp32-hal/examples/embassy_i2c.rs index a093bdf9a7f..e8b848f7ada 100644 --- a/esp32-hal/examples/embassy_i2c.rs +++ b/esp32-hal/examples/embassy_i2c.rs @@ -35,7 +35,7 @@ async fn main(_spawner: Spawner) { let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32-hal/examples/embassy_i2s_read.rs b/esp32-hal/examples/embassy_i2s_read.rs index b3c1b979701..7a3680e0f59 100644 --- a/esp32-hal/examples/embassy_i2s_read.rs +++ b/esp32-hal/examples/embassy_i2s_read.rs @@ -40,7 +40,7 @@ async fn main(_spawner: Spawner) { let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32-hal/examples/embassy_i2s_sound.rs b/esp32-hal/examples/embassy_i2s_sound.rs index 9e1221f37e7..0039797f0ad 100644 --- a/esp32-hal/examples/embassy_i2s_sound.rs +++ b/esp32-hal/examples/embassy_i2s_sound.rs @@ -64,7 +64,7 @@ async fn main(_spawner: Spawner) { let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32-hal/examples/embassy_multicore.rs b/esp32-hal/examples/embassy_multicore.rs index b0081fa627c..6364dca5bee 100644 --- a/esp32-hal/examples/embassy_multicore.rs +++ b/esp32-hal/examples/embassy_multicore.rs @@ -51,7 +51,7 @@ async fn main(_spawner: Spawner) { let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); // Set GPIO2 as an output, and set its state high initially. let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32-hal/examples/embassy_multicore_interrupt.rs b/esp32-hal/examples/embassy_multicore_interrupt.rs index 3a2371608d0..b3098c30509 100644 --- a/esp32-hal/examples/embassy_multicore_interrupt.rs +++ b/esp32-hal/examples/embassy_multicore_interrupt.rs @@ -86,7 +86,7 @@ fn main() -> ! { let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); // Set GPIO2 as an output, and set its state high initially. let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32-hal/examples/embassy_multiprio.rs b/esp32-hal/examples/embassy_multiprio.rs index a79fbf21b7d..7528122f056 100644 --- a/esp32-hal/examples/embassy_multiprio.rs +++ b/esp32-hal/examples/embassy_multiprio.rs @@ -79,11 +79,8 @@ async fn main(low_prio_spawner: Spawner) { let system = peripherals.SYSTEM.split(); let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); - #[cfg(feature = "embassy-time-timg0")] - { - let timer_group0 = esp32_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); - } + let timer_group0 = esp32_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); + embassy::init(&clocks, timer_group0); let spawner = INT_EXECUTOR_0.start(Priority::Priority2); spawner.must_spawn(high_prio()); diff --git a/esp32-hal/examples/embassy_rmt_rx.rs b/esp32-hal/examples/embassy_rmt_rx.rs index ea56c0da632..ac13f3b9897 100644 --- a/esp32-hal/examples/embassy_rmt_rx.rs +++ b/esp32-hal/examples/embassy_rmt_rx.rs @@ -48,7 +48,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32-hal/examples/embassy_rmt_tx.rs b/esp32-hal/examples/embassy_rmt_tx.rs index 30377e82a4a..366b42dc695 100644 --- a/esp32-hal/examples/embassy_rmt_tx.rs +++ b/esp32-hal/examples/embassy_rmt_tx.rs @@ -31,7 +31,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32-hal/examples/embassy_serial.rs b/esp32-hal/examples/embassy_serial.rs index 115f7e37d05..8f5e02f70d0 100644 --- a/esp32-hal/examples/embassy_serial.rs +++ b/esp32-hal/examples/embassy_serial.rs @@ -79,7 +79,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let mut uart0 = Uart::new(peripherals.UART0, &clocks); diff --git a/esp32-hal/examples/embassy_spi.rs b/esp32-hal/examples/embassy_spi.rs index c5ad70986be..aa5c6fda13e 100644 --- a/esp32-hal/examples/embassy_spi.rs +++ b/esp32-hal/examples/embassy_spi.rs @@ -45,7 +45,7 @@ async fn main(_spawner: Spawner) { let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); let sclk = io.pins.gpio19; diff --git a/esp32-hal/examples/embassy_wait.rs b/esp32-hal/examples/embassy_wait.rs index f7bdeb249bd..112b13057c4 100644 --- a/esp32-hal/examples/embassy_wait.rs +++ b/esp32-hal/examples/embassy_wait.rs @@ -27,7 +27,7 @@ async fn main(_spawner: Spawner) { let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); // GPIO 0 as input diff --git a/esp32c2-hal/examples/embassy_multiprio.rs b/esp32c2-hal/examples/embassy_multiprio.rs index f68c51cb085..d60fdca73a4 100644 --- a/esp32c2-hal/examples/embassy_multiprio.rs +++ b/esp32c2-hal/examples/embassy_multiprio.rs @@ -88,7 +88,7 @@ async fn main(low_prio_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let spawner = INT_EXECUTOR_0.start(Priority::Priority2); diff --git a/esp32c2-hal/examples/embassy_serial.rs b/esp32c2-hal/examples/embassy_serial.rs index b5c7f137f09..7c52fe423bc 100644 --- a/esp32c2-hal/examples/embassy_serial.rs +++ b/esp32c2-hal/examples/embassy_serial.rs @@ -79,7 +79,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let mut uart0 = Uart::new(peripherals.UART0, &clocks); diff --git a/esp32c3-hal/examples/embassy_multiprio.rs b/esp32c3-hal/examples/embassy_multiprio.rs index e9fcc38deb5..d9469b4460e 100644 --- a/esp32c3-hal/examples/embassy_multiprio.rs +++ b/esp32c3-hal/examples/embassy_multiprio.rs @@ -88,7 +88,7 @@ async fn main(low_prio_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let spawner = INT_EXECUTOR_0.start(Priority::Priority2); diff --git a/esp32c3-hal/examples/embassy_serial.rs b/esp32c3-hal/examples/embassy_serial.rs index adacaa16f3f..9e1ac29c79e 100644 --- a/esp32c3-hal/examples/embassy_serial.rs +++ b/esp32c3-hal/examples/embassy_serial.rs @@ -79,7 +79,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let mut uart0 = Uart::new(peripherals.UART0, &clocks); diff --git a/esp32c6-hal/examples/embassy_hello_world.rs b/esp32c6-hal/examples/embassy_hello_world.rs index 48724ab1604..4f1039348c5 100644 --- a/esp32c6-hal/examples/embassy_hello_world.rs +++ b/esp32c6-hal/examples/embassy_hello_world.rs @@ -36,7 +36,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } spawner.spawn(run()).ok(); diff --git a/esp32c6-hal/examples/embassy_i2c.rs b/esp32c6-hal/examples/embassy_i2c.rs index 7faed5d7d18..4b83e6e375c 100644 --- a/esp32c6-hal/examples/embassy_i2c.rs +++ b/esp32c6-hal/examples/embassy_i2c.rs @@ -42,7 +42,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c6-hal/examples/embassy_multiprio.rs b/esp32c6-hal/examples/embassy_multiprio.rs index 93ef34ba0f4..ac4f3a02155 100644 --- a/esp32c6-hal/examples/embassy_multiprio.rs +++ b/esp32c6-hal/examples/embassy_multiprio.rs @@ -88,7 +88,7 @@ async fn main(low_prio_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let spawner = INT_EXECUTOR_0.start(Priority::Priority2); diff --git a/esp32c6-hal/examples/embassy_parl_io_rx.rs b/esp32c6-hal/examples/embassy_parl_io_rx.rs index 7a24888ddab..b563c28dc41 100644 --- a/esp32c6-hal/examples/embassy_parl_io_rx.rs +++ b/esp32c6-hal/examples/embassy_parl_io_rx.rs @@ -39,7 +39,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c6-hal/examples/embassy_parl_io_tx.rs b/esp32c6-hal/examples/embassy_parl_io_tx.rs index b242ae67e8b..8a6b4a3cfb9 100644 --- a/esp32c6-hal/examples/embassy_parl_io_tx.rs +++ b/esp32c6-hal/examples/embassy_parl_io_tx.rs @@ -50,7 +50,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c6-hal/examples/embassy_serial.rs b/esp32c6-hal/examples/embassy_serial.rs index d39da32c153..f539274e130 100644 --- a/esp32c6-hal/examples/embassy_serial.rs +++ b/esp32c6-hal/examples/embassy_serial.rs @@ -79,7 +79,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let mut uart0 = Uart::new(peripherals.UART0, &clocks); diff --git a/esp32c6-hal/examples/embassy_spi.rs b/esp32c6-hal/examples/embassy_spi.rs index c7d28fa0318..cf284971e6a 100644 --- a/esp32c6-hal/examples/embassy_spi.rs +++ b/esp32c6-hal/examples/embassy_spi.rs @@ -52,7 +52,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c6-hal/examples/embassy_wait.rs b/esp32c6-hal/examples/embassy_wait.rs index 01e21351ce5..69f2977d7bf 100644 --- a/esp32c6-hal/examples/embassy_wait.rs +++ b/esp32c6-hal/examples/embassy_wait.rs @@ -28,7 +28,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32h2-hal/examples/embassy_hello_world.rs b/esp32h2-hal/examples/embassy_hello_world.rs index 03cb026da34..071c49df137 100644 --- a/esp32h2-hal/examples/embassy_hello_world.rs +++ b/esp32h2-hal/examples/embassy_hello_world.rs @@ -36,7 +36,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } spawner.spawn(run()).ok(); diff --git a/esp32h2-hal/examples/embassy_i2c.rs b/esp32h2-hal/examples/embassy_i2c.rs index 46317727372..78c2014908c 100644 --- a/esp32h2-hal/examples/embassy_i2c.rs +++ b/esp32h2-hal/examples/embassy_i2c.rs @@ -42,7 +42,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32h2-hal/examples/embassy_multiprio.rs b/esp32h2-hal/examples/embassy_multiprio.rs index 5a1651c1821..e66b467e0ae 100644 --- a/esp32h2-hal/examples/embassy_multiprio.rs +++ b/esp32h2-hal/examples/embassy_multiprio.rs @@ -88,7 +88,7 @@ async fn main(low_prio_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let spawner = INT_EXECUTOR_0.start(Priority::Priority2); diff --git a/esp32h2-hal/examples/embassy_parl_io_rx.rs b/esp32h2-hal/examples/embassy_parl_io_rx.rs index 6bd452fb942..ec767611f65 100644 --- a/esp32h2-hal/examples/embassy_parl_io_rx.rs +++ b/esp32h2-hal/examples/embassy_parl_io_rx.rs @@ -39,7 +39,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32h2-hal/examples/embassy_parl_io_tx.rs b/esp32h2-hal/examples/embassy_parl_io_tx.rs index def3dc5639b..85aa4870b79 100644 --- a/esp32h2-hal/examples/embassy_parl_io_tx.rs +++ b/esp32h2-hal/examples/embassy_parl_io_tx.rs @@ -50,7 +50,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32h2-hal/examples/embassy_serial.rs b/esp32h2-hal/examples/embassy_serial.rs index 52bc5fa8453..759650517f9 100644 --- a/esp32h2-hal/examples/embassy_serial.rs +++ b/esp32h2-hal/examples/embassy_serial.rs @@ -79,7 +79,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let mut uart0 = Uart::new(peripherals.UART0, &clocks); diff --git a/esp32h2-hal/examples/embassy_spi.rs b/esp32h2-hal/examples/embassy_spi.rs index cd0bf520ffd..ca1f666d0a5 100644 --- a/esp32h2-hal/examples/embassy_spi.rs +++ b/esp32h2-hal/examples/embassy_spi.rs @@ -52,7 +52,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32h2-hal/examples/embassy_wait.rs b/esp32h2-hal/examples/embassy_wait.rs index 12075eded0a..23a793b1c89 100644 --- a/esp32h2-hal/examples/embassy_wait.rs +++ b/esp32h2-hal/examples/embassy_wait.rs @@ -28,7 +28,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s2-hal/examples/embassy_hello_world.rs b/esp32s2-hal/examples/embassy_hello_world.rs index 08cfd6992e0..1ecb0bcc76f 100644 --- a/esp32s2-hal/examples/embassy_hello_world.rs +++ b/esp32s2-hal/examples/embassy_hello_world.rs @@ -41,7 +41,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } spawner.spawn(run()).ok(); diff --git a/esp32s2-hal/examples/embassy_i2c.rs b/esp32s2-hal/examples/embassy_i2c.rs index d09420a9241..3460b89b6dd 100644 --- a/esp32s2-hal/examples/embassy_i2c.rs +++ b/esp32s2-hal/examples/embassy_i2c.rs @@ -42,7 +42,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s2-hal/examples/embassy_i2s_read.rs b/esp32s2-hal/examples/embassy_i2s_read.rs index a55c26fa134..70413d99aff 100644 --- a/esp32s2-hal/examples/embassy_i2s_read.rs +++ b/esp32s2-hal/examples/embassy_i2s_read.rs @@ -47,7 +47,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s2-hal/examples/embassy_i2s_sound.rs b/esp32s2-hal/examples/embassy_i2s_sound.rs index cbb0684d7b5..3940fecbd22 100644 --- a/esp32s2-hal/examples/embassy_i2s_sound.rs +++ b/esp32s2-hal/examples/embassy_i2s_sound.rs @@ -72,7 +72,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s2-hal/examples/embassy_multiprio.rs b/esp32s2-hal/examples/embassy_multiprio.rs index 6a82b63dd79..1d040fec2a9 100644 --- a/esp32s2-hal/examples/embassy_multiprio.rs +++ b/esp32s2-hal/examples/embassy_multiprio.rs @@ -88,7 +88,7 @@ async fn main(low_prio_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let spawner = INT_EXECUTOR_0.start(Priority::Priority2); diff --git a/esp32s2-hal/examples/embassy_rmt_rx.rs b/esp32s2-hal/examples/embassy_rmt_rx.rs index eafd60d6279..28ad974f5a4 100644 --- a/esp32s2-hal/examples/embassy_rmt_rx.rs +++ b/esp32s2-hal/examples/embassy_rmt_rx.rs @@ -54,7 +54,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s2-hal/examples/embassy_rmt_tx.rs b/esp32s2-hal/examples/embassy_rmt_tx.rs index 2fc1bff3db0..dd557c90d31 100644 --- a/esp32s2-hal/examples/embassy_rmt_tx.rs +++ b/esp32s2-hal/examples/embassy_rmt_tx.rs @@ -37,7 +37,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s2-hal/examples/embassy_serial.rs b/esp32s2-hal/examples/embassy_serial.rs index d263c668d36..9e94ad0fc76 100644 --- a/esp32s2-hal/examples/embassy_serial.rs +++ b/esp32s2-hal/examples/embassy_serial.rs @@ -79,7 +79,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let mut uart0 = Uart::new(peripherals.UART0, &clocks); diff --git a/esp32s2-hal/examples/embassy_spi.rs b/esp32s2-hal/examples/embassy_spi.rs index cac042183f9..62963826089 100644 --- a/esp32s2-hal/examples/embassy_spi.rs +++ b/esp32s2-hal/examples/embassy_spi.rs @@ -52,7 +52,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s2-hal/examples/embassy_wait.rs b/esp32s2-hal/examples/embassy_wait.rs index 55b751c3190..5c15e70c66b 100644 --- a/esp32s2-hal/examples/embassy_wait.rs +++ b/esp32s2-hal/examples/embassy_wait.rs @@ -34,7 +34,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s3-hal/examples/embassy_hello_world.rs b/esp32s3-hal/examples/embassy_hello_world.rs index e76c612629d..82daacd6536 100644 --- a/esp32s3-hal/examples/embassy_hello_world.rs +++ b/esp32s3-hal/examples/embassy_hello_world.rs @@ -41,7 +41,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } spawner.spawn(run()).ok(); diff --git a/esp32s3-hal/examples/embassy_i2c.rs b/esp32s3-hal/examples/embassy_i2c.rs index 2680b8e3f5e..a4f1d31617d 100644 --- a/esp32s3-hal/examples/embassy_i2c.rs +++ b/esp32s3-hal/examples/embassy_i2c.rs @@ -42,7 +42,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s3-hal/examples/embassy_multicore.rs b/esp32s3-hal/examples/embassy_multicore.rs index 39deeec092b..67b857b504c 100644 --- a/esp32s3-hal/examples/embassy_multicore.rs +++ b/esp32s3-hal/examples/embassy_multicore.rs @@ -61,7 +61,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let mut cpu_control = CpuControl::new(system.cpu_control); diff --git a/esp32s3-hal/examples/embassy_multicore_interrupt.rs b/esp32s3-hal/examples/embassy_multicore_interrupt.rs index 1274cd73d5b..522139ab9df 100644 --- a/esp32s3-hal/examples/embassy_multicore_interrupt.rs +++ b/esp32s3-hal/examples/embassy_multicore_interrupt.rs @@ -96,7 +96,7 @@ fn main() -> ! { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let mut cpu_control = CpuControl::new(system.cpu_control); diff --git a/esp32s3-hal/examples/embassy_multiprio.rs b/esp32s3-hal/examples/embassy_multiprio.rs index 6280f7dcfaf..06ebdf9324e 100644 --- a/esp32s3-hal/examples/embassy_multiprio.rs +++ b/esp32s3-hal/examples/embassy_multiprio.rs @@ -88,7 +88,7 @@ async fn main(low_prio_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let spawner = INT_EXECUTOR_0.start(Priority::Priority2); diff --git a/esp32s3-hal/examples/embassy_rmt_rx.rs b/esp32s3-hal/examples/embassy_rmt_rx.rs index f24f18cd765..1d3e8da01f3 100644 --- a/esp32s3-hal/examples/embassy_rmt_rx.rs +++ b/esp32s3-hal/examples/embassy_rmt_rx.rs @@ -40,7 +40,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s3-hal/examples/embassy_serial.rs b/esp32s3-hal/examples/embassy_serial.rs index 267f259b501..3805c522089 100644 --- a/esp32s3-hal/examples/embassy_serial.rs +++ b/esp32s3-hal/examples/embassy_serial.rs @@ -79,7 +79,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let mut uart0 = Uart::new(peripherals.UART0, &clocks); diff --git a/esp32s3-hal/examples/embassy_spi.rs b/esp32s3-hal/examples/embassy_spi.rs index 82ab93c96e4..9cdd7125ec2 100644 --- a/esp32s3-hal/examples/embassy_spi.rs +++ b/esp32s3-hal/examples/embassy_spi.rs @@ -52,7 +52,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s3-hal/examples/embassy_wait.rs b/esp32s3-hal/examples/embassy_wait.rs index e4b5fb24912..5e26a449dd4 100644 --- a/esp32s3-hal/examples/embassy_wait.rs +++ b/esp32s3-hal/examples/embassy_wait.rs @@ -34,7 +34,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] { let timer_group0 = esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks); - embassy::init(&clocks, timer_group0.timer0); + embassy::init(&clocks, timer_group0); } let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); From a49af1b9bd598a85721b1ba31a4c62a2e776912a Mon Sep 17 00:00:00 2001 From: bjoernQ Date: Wed, 17 Jan 2024 15:20:00 +0100 Subject: [PATCH 2/4] CHANGELOG.md entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4a2177be88..54688d0fd83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -88,6 +88,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix SPI slave DMA dma\_read and dma\_write (#1013) - ESP32-C6/H2: Fix disabling of interrupts (#1040) - ESP32/ESP32-S3: Fix stack-top calculation for app-core (#1081) +- ESP32/ESP32-S2/ESP32-S3: Fix embassy-time-timg0 driver (#1091) ### Removed From 32087d34acbbea22cd5bf05f2eb2c43c195e523c Mon Sep 17 00:00:00 2001 From: bjoernQ Date: Wed, 17 Jan 2024 15:34:47 +0100 Subject: [PATCH 3/4] Fix examples --- esp32c2-hal/examples/embassy_hello_world.rs | 2 +- esp32c2-hal/examples/embassy_i2c.rs | 2 +- esp32c2-hal/examples/embassy_spi.rs | 2 +- esp32c2-hal/examples/embassy_wait.rs | 2 +- esp32c3-hal/examples/embassy_hello_world.rs | 2 +- esp32c3-hal/examples/embassy_i2c.rs | 2 +- esp32c3-hal/examples/embassy_i2s_read.rs | 2 +- esp32c3-hal/examples/embassy_i2s_sound.rs | 2 +- esp32c3-hal/examples/embassy_rmt_rx.rs | 2 +- esp32c3-hal/examples/embassy_rmt_tx.rs | 2 +- esp32c3-hal/examples/embassy_spi.rs | 2 +- esp32c3-hal/examples/embassy_usb_serial_jtag.rs | 2 +- esp32c3-hal/examples/embassy_wait.rs | 2 +- esp32c6-hal/examples/embassy_i2s_read.rs | 2 +- esp32c6-hal/examples/embassy_i2s_sound.rs | 2 +- esp32c6-hal/examples/embassy_rmt_rx.rs | 2 +- esp32c6-hal/examples/embassy_rmt_tx.rs | 2 +- esp32c6-hal/examples/embassy_usb_serial_jtag.rs | 2 +- esp32h2-hal/examples/embassy_i2s_read.rs | 2 +- esp32h2-hal/examples/embassy_i2s_sound.rs | 2 +- esp32h2-hal/examples/embassy_rmt_rx.rs | 2 +- esp32h2-hal/examples/embassy_rmt_tx.rs | 2 +- esp32h2-hal/examples/embassy_usb_serial_jtag.rs | 2 +- esp32s3-hal/examples/embassy_i2s_read.rs | 2 +- esp32s3-hal/examples/embassy_i2s_sound.rs | 2 +- esp32s3-hal/examples/embassy_rmt_tx.rs | 2 +- esp32s3-hal/examples/embassy_usb_serial_jtag.rs | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/esp32c2-hal/examples/embassy_hello_world.rs b/esp32c2-hal/examples/embassy_hello_world.rs index b82729a95f2..4c32f9c227c 100644 --- a/esp32c2-hal/examples/embassy_hello_world.rs +++ b/esp32c2-hal/examples/embassy_hello_world.rs @@ -36,7 +36,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); spawner.spawn(run()).ok(); diff --git a/esp32c2-hal/examples/embassy_i2c.rs b/esp32c2-hal/examples/embassy_i2c.rs index 1ddc7944ee9..f63cf271bcb 100644 --- a/esp32c2-hal/examples/embassy_i2c.rs +++ b/esp32c2-hal/examples/embassy_i2c.rs @@ -42,7 +42,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c2-hal/examples/embassy_spi.rs b/esp32c2-hal/examples/embassy_spi.rs index a0cfeffe423..9d6518aa5bd 100644 --- a/esp32c2-hal/examples/embassy_spi.rs +++ b/esp32c2-hal/examples/embassy_spi.rs @@ -52,7 +52,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c2-hal/examples/embassy_wait.rs b/esp32c2-hal/examples/embassy_wait.rs index 0a6713066bf..efa9c2188c0 100644 --- a/esp32c2-hal/examples/embassy_wait.rs +++ b/esp32c2-hal/examples/embassy_wait.rs @@ -28,7 +28,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c3-hal/examples/embassy_hello_world.rs b/esp32c3-hal/examples/embassy_hello_world.rs index 704a6380409..3b0519ba1ef 100644 --- a/esp32c3-hal/examples/embassy_hello_world.rs +++ b/esp32c3-hal/examples/embassy_hello_world.rs @@ -36,7 +36,7 @@ async fn main(spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); spawner.spawn(run()).ok(); diff --git a/esp32c3-hal/examples/embassy_i2c.rs b/esp32c3-hal/examples/embassy_i2c.rs index 17de9c2d35b..604309a2fb3 100644 --- a/esp32c3-hal/examples/embassy_i2c.rs +++ b/esp32c3-hal/examples/embassy_i2c.rs @@ -42,7 +42,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c3-hal/examples/embassy_i2s_read.rs b/esp32c3-hal/examples/embassy_i2s_read.rs index c685180769e..9d3ec3d1d7f 100644 --- a/esp32c3-hal/examples/embassy_i2s_read.rs +++ b/esp32c3-hal/examples/embassy_i2s_read.rs @@ -48,7 +48,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c3-hal/examples/embassy_i2s_sound.rs b/esp32c3-hal/examples/embassy_i2s_sound.rs index 23dab12fe70..dfd0ce8a57a 100644 --- a/esp32c3-hal/examples/embassy_i2s_sound.rs +++ b/esp32c3-hal/examples/embassy_i2s_sound.rs @@ -72,7 +72,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c3-hal/examples/embassy_rmt_rx.rs b/esp32c3-hal/examples/embassy_rmt_rx.rs index c4f809235fd..b96e88a649a 100644 --- a/esp32c3-hal/examples/embassy_rmt_rx.rs +++ b/esp32c3-hal/examples/embassy_rmt_rx.rs @@ -40,7 +40,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c3-hal/examples/embassy_rmt_tx.rs b/esp32c3-hal/examples/embassy_rmt_tx.rs index e4e0f62488c..50e8893648f 100644 --- a/esp32c3-hal/examples/embassy_rmt_tx.rs +++ b/esp32c3-hal/examples/embassy_rmt_tx.rs @@ -37,7 +37,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c3-hal/examples/embassy_spi.rs b/esp32c3-hal/examples/embassy_spi.rs index fadd5c79af8..c12bd0f5f9f 100644 --- a/esp32c3-hal/examples/embassy_spi.rs +++ b/esp32c3-hal/examples/embassy_spi.rs @@ -52,7 +52,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c3-hal/examples/embassy_usb_serial_jtag.rs b/esp32c3-hal/examples/embassy_usb_serial_jtag.rs index b181c05e348..be7bf00e44b 100644 --- a/esp32c3-hal/examples/embassy_usb_serial_jtag.rs +++ b/esp32c3-hal/examples/embassy_usb_serial_jtag.rs @@ -34,7 +34,7 @@ async fn main(_spawner: Spawner) -> ! { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let mut usb_serial = UsbSerialJtag::new(peripherals.USB_DEVICE); diff --git a/esp32c3-hal/examples/embassy_wait.rs b/esp32c3-hal/examples/embassy_wait.rs index 14ab09d5810..fb00a937b57 100644 --- a/esp32c3-hal/examples/embassy_wait.rs +++ b/esp32c3-hal/examples/embassy_wait.rs @@ -28,7 +28,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c6-hal/examples/embassy_i2s_read.rs b/esp32c6-hal/examples/embassy_i2s_read.rs index f56b30f7399..eb54eaff5f8 100644 --- a/esp32c6-hal/examples/embassy_i2s_read.rs +++ b/esp32c6-hal/examples/embassy_i2s_read.rs @@ -48,7 +48,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c6-hal/examples/embassy_i2s_sound.rs b/esp32c6-hal/examples/embassy_i2s_sound.rs index 7d2751ecc26..9aacf5c398b 100644 --- a/esp32c6-hal/examples/embassy_i2s_sound.rs +++ b/esp32c6-hal/examples/embassy_i2s_sound.rs @@ -72,7 +72,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c6-hal/examples/embassy_rmt_rx.rs b/esp32c6-hal/examples/embassy_rmt_rx.rs index 2751179cbe0..5ff4cc37010 100644 --- a/esp32c6-hal/examples/embassy_rmt_rx.rs +++ b/esp32c6-hal/examples/embassy_rmt_rx.rs @@ -40,7 +40,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c6-hal/examples/embassy_rmt_tx.rs b/esp32c6-hal/examples/embassy_rmt_tx.rs index 56eec9f5b0d..852f297076c 100644 --- a/esp32c6-hal/examples/embassy_rmt_tx.rs +++ b/esp32c6-hal/examples/embassy_rmt_tx.rs @@ -37,7 +37,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32c6-hal/examples/embassy_usb_serial_jtag.rs b/esp32c6-hal/examples/embassy_usb_serial_jtag.rs index bdab49dd10c..9a7e3ff4f29 100644 --- a/esp32c6-hal/examples/embassy_usb_serial_jtag.rs +++ b/esp32c6-hal/examples/embassy_usb_serial_jtag.rs @@ -33,7 +33,7 @@ async fn main(_spawner: Spawner) -> ! { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32c6_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let mut usb_serial = UsbSerialJtag::new(peripherals.USB_DEVICE); diff --git a/esp32h2-hal/examples/embassy_i2s_read.rs b/esp32h2-hal/examples/embassy_i2s_read.rs index 73c4702b73d..9bd447b5c15 100644 --- a/esp32h2-hal/examples/embassy_i2s_read.rs +++ b/esp32h2-hal/examples/embassy_i2s_read.rs @@ -48,7 +48,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32h2-hal/examples/embassy_i2s_sound.rs b/esp32h2-hal/examples/embassy_i2s_sound.rs index afb65d6eee7..c3e64d628ff 100644 --- a/esp32h2-hal/examples/embassy_i2s_sound.rs +++ b/esp32h2-hal/examples/embassy_i2s_sound.rs @@ -72,7 +72,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32h2-hal/examples/embassy_rmt_rx.rs b/esp32h2-hal/examples/embassy_rmt_rx.rs index c4531d46f5c..df20174dd33 100644 --- a/esp32h2-hal/examples/embassy_rmt_rx.rs +++ b/esp32h2-hal/examples/embassy_rmt_rx.rs @@ -40,7 +40,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32h2-hal/examples/embassy_rmt_tx.rs b/esp32h2-hal/examples/embassy_rmt_tx.rs index 7a3671eb718..285348bc5fd 100644 --- a/esp32h2-hal/examples/embassy_rmt_tx.rs +++ b/esp32h2-hal/examples/embassy_rmt_tx.rs @@ -37,7 +37,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32h2-hal/examples/embassy_usb_serial_jtag.rs b/esp32h2-hal/examples/embassy_usb_serial_jtag.rs index 93a3efdc63c..6e8db424247 100644 --- a/esp32h2-hal/examples/embassy_usb_serial_jtag.rs +++ b/esp32h2-hal/examples/embassy_usb_serial_jtag.rs @@ -33,7 +33,7 @@ async fn main(_spawner: Spawner) -> ! { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32h2_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let mut usb_serial = UsbSerialJtag::new(peripherals.USB_DEVICE); diff --git a/esp32s3-hal/examples/embassy_i2s_read.rs b/esp32s3-hal/examples/embassy_i2s_read.rs index 64f1f9d7544..2f5ed7721d3 100644 --- a/esp32s3-hal/examples/embassy_i2s_read.rs +++ b/esp32s3-hal/examples/embassy_i2s_read.rs @@ -48,7 +48,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s3-hal/examples/embassy_i2s_sound.rs b/esp32s3-hal/examples/embassy_i2s_sound.rs index 8951389aa59..72ef98f7376 100644 --- a/esp32s3-hal/examples/embassy_i2s_sound.rs +++ b/esp32s3-hal/examples/embassy_i2s_sound.rs @@ -72,7 +72,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s3-hal/examples/embassy_rmt_tx.rs b/esp32s3-hal/examples/embassy_rmt_tx.rs index 2398f1776a9..ad2c412ee09 100644 --- a/esp32s3-hal/examples/embassy_rmt_tx.rs +++ b/esp32s3-hal/examples/embassy_rmt_tx.rs @@ -37,7 +37,7 @@ async fn main(_spawner: Spawner) { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); diff --git a/esp32s3-hal/examples/embassy_usb_serial_jtag.rs b/esp32s3-hal/examples/embassy_usb_serial_jtag.rs index 4221aa8dbd9..ad7bb2028f6 100644 --- a/esp32s3-hal/examples/embassy_usb_serial_jtag.rs +++ b/esp32s3-hal/examples/embassy_usb_serial_jtag.rs @@ -33,7 +33,7 @@ async fn main(_spawner: Spawner) -> ! { #[cfg(feature = "embassy-time-timg0")] embassy::init( &clocks, - esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks).timer0, + esp32s3_hal::timer::TimerGroup::new(peripherals.TIMG0, &clocks), ); let mut usb_serial = UsbSerialJtag::new(peripherals.USB_DEVICE); From cc59835473966a6c6afe720c7850c8d04f8da9fe Mon Sep 17 00:00:00 2001 From: bjoernQ Date: Wed, 17 Jan 2024 17:19:20 +0100 Subject: [PATCH 4/4] Fix CHANGELOG.md --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54688d0fd83..e0a3fc22c3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Set up interrupts for the DMA and async enabled peripherals only when `async` feature is provided (#1042) - Update to `1.0.0` releases of the `embedded-hal-*` packages (#1068) - Update `embassy-time` to `0.3.0` and embassy-executor to `0.5.0` release due to the release of the `embedded-hal-*` packages (#1075) @@ -28,6 +29,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - ESP32: correct gpio 32/33 in errata36() (#1053) - ESP32: make gpio 4 usable as analog pin (#1078) +- Fix double &mut for the `SetDutyCycle` impl on `PwmPin` (#1033) +- ESP32/ESP32-S3: Fix stack-top calculation for app-core (#1081) +- ESP32/ESP32-S2/ESP32-S3: Fix embassy-time-timg0 driver (#1091) ### Removed @@ -40,7 +44,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fix SHA for all targets (#1021) -- Fix double &mut for the `SetDutyCycle` impl on `PwmPin` (#1033) ## [0.14.0] - 2023-12-12 @@ -71,7 +74,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated to latest release candidate (`1.0.0-rc.2`) for `embedded-hal{-async,-nb}` (#994) - Explicit panic when hitting the `DefaultHandler` (#1005) - Relevant interrupts are now auto enabled in `embassy::init` (#1014). -- Set up interrupts for the DMA and async enabled peripherals only when `async` feature is provided (#1042) ### Fixed @@ -87,8 +89,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - ESP32-H2: Fix used RAM (#1003) - Fix SPI slave DMA dma\_read and dma\_write (#1013) - ESP32-C6/H2: Fix disabling of interrupts (#1040) -- ESP32/ESP32-S3: Fix stack-top calculation for app-core (#1081) -- ESP32/ESP32-S2/ESP32-S3: Fix embassy-time-timg0 driver (#1091) ### Removed