diff --git a/CHANGELOG.md b/CHANGELOG.md index e65a4ea1..6f1d3d49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- update with Timer and peripheral naming changes in `esp-hal` + ### Changed ### Removed diff --git a/esp-wifi/src/lib.rs b/esp-wifi/src/lib.rs index 1540dc15..d5760d24 100644 --- a/esp-wifi/src/lib.rs +++ b/esp-wifi/src/lib.rs @@ -160,7 +160,7 @@ pub(crate) type EspWifiTimer = Alarm; #[cfg(any(esp32, esp32s3, esp32s2))] pub(crate) type EspWifiTimer = - hal::timer::Timer, esp_hal::Blocking>; + hal::timer::timg::Timer, esp_hal::Blocking>; #[derive(Debug, PartialEq, PartialOrd)] #[cfg_attr(feature = "defmt", derive(defmt::Format))] diff --git a/esp-wifi/src/timer/xtensa.rs b/esp-wifi/src/timer/xtensa.rs index 7588cd0e..7567af8a 100644 --- a/esp-wifi/src/timer/xtensa.rs +++ b/esp-wifi/src/timer/xtensa.rs @@ -9,7 +9,7 @@ use crate::{ interrupt, peripherals::{self, TIMG1}, prelude::*, - timer::{Timer, Timer0}, + timer::timg::{Timer, Timer0}, trapframe::TrapFrame, xtensa_lx, xtensa_lx_rt, },