update with timer changes in esp-hal

esp-rs · May 10, 2024 · 64c7983 · 64c7983
1 parent 09f5f93
commit 64c7983
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -160,7 +160,7 @@ pub(crate) type EspWifiTimer = Alarm<Target, esp_hal::Blocking, 0>;
 
 #[cfg(any(esp32, esp32s3, esp32s2))]
 pub(crate) type EspWifiTimer =
-    hal::timer::Timer<hal::timer::Timer0<hal::peripherals::TIMG1>, esp_hal::Blocking>;
+    hal::timer::timg::Timer<hal::timer::timg::Timer0<hal::peripherals::TIMG1>, 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
@@ -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,
     },