diff --git a/esp-wifi/src/timer/riscv.rs b/esp-wifi/src/timer/riscv.rs index ea03cb898fe..ea9837652a5 100644 --- a/esp-wifi/src/timer/riscv.rs +++ b/esp-wifi/src/timer/riscv.rs @@ -1,10 +1,7 @@ use core::cell::RefCell; use critical_section::Mutex; -use esp_hal::{ - interrupt::InterruptHandler, - timer::{ErasedTimer, PeriodicTimer}, -}; +use esp_hal::interrupt::InterruptHandler; #[cfg(any(feature = "esp32c6", feature = "esp32h2"))] use peripherals::INTPRI as SystemPeripheral; #[cfg(not(any(feature = "esp32c6", feature = "esp32h2")))] diff --git a/examples/src/bin/embassy_touch.rs b/examples/src/bin/embassy_touch.rs index ec3da3fdccb..eb686243575 100644 --- a/examples/src/bin/embassy_touch.rs +++ b/examples/src/bin/embassy_touch.rs @@ -22,21 +22,11 @@ use esp_hal::{ peripherals::Peripherals, rtc_cntl::Rtc, system::SystemControl, - timer::{timg::TimerGroup, ErasedTimer, OneShotTimer}, + timer::timg::TimerGroup, touch::{Touch, TouchConfig, TouchPad}, }; use esp_println::println; -// When you are okay with using a nightly compiler it's better to use https://docs.rs/static_cell/2.1.0/static_cell/macro.make_static.html -macro_rules! mk_static { - ($t:ty,$val:expr) => {{ - static STATIC_CELL: static_cell::StaticCell<$t> = static_cell::StaticCell::new(); - #[deny(unused_attributes)] - let x = STATIC_CELL.uninit().write(($val)); - x - }}; -} - #[esp_hal_embassy::main] async fn main(_spawner: Spawner) { esp_println::logger::init_logger_from_env();