feat: update esp-hal to 1.0.0-beta.0

Author: filipton

Cargo.lock

@@ -5,23 +5,23 @@ authors = ["filipton <filipton12@gmail.com>"]
 edition = "2021"
 
 [dependencies]
-esp-backtrace = { version = "0.15.0", features = [ "exception-handler", "panic-handler", "println", "custom-pre-backtrace", "custom-halt" ] }
-esp-hal = { version = "0.23.1", features = [  ] }
-esp-println = { version = "0.13.0", features = ["log"] }
-log = { version = "0.4.25" }
-esp-wifi = { version = "0.12.0", features = ["coex"] }
-esp-hal-embassy = { version = "0.6.0", features = [] }
+esp-backtrace = { version = "0.15.1", features = [ "exception-handler", "panic-handler", "println", "custom-pre-backtrace", "custom-halt" ] }
+esp-hal = { version = "1.0.0-beta.0", features = [  ] }
+esp-println = { version = "0.13.1", features = ["log"] }
+log = { version = "0.4.26" }
+esp-wifi = { version = "0.13.0", features = ["coex"] }
+esp-hal-embassy = { version = "0.7.0", features = [] }
 embassy-executor = { version = "0.7.0", features = ["arch-riscv32", "nightly"] }
 embassy-net = { version = "0.6.0", features = ["tcp", "udp", "multicast", "dhcpv4", "medium-ethernet", "proto-ipv4", "dns"] }
 embassy-time = { version = "0.4.0" }
-esp-storage = { version = "0.4.0", features = [] }
+esp-storage = { version = "0.5.0", features = [] }
 embedded-storage = "0.3.1"
 static_cell = { version = "2.1.0", features = ["nightly"] }
 heapless = { version = "0.8.0", default-features = false }
-esp-alloc = "0.6.0"
+esp-alloc = "0.7.0"
 esp-hal-wifimanager = { git = "https://github.com/filipton/esp-hal-wifimanager", default-features = false, features = ["ap", "ble"] }
-serde = { version = "1.0.217", features = ["alloc", "derive"], default-features = false }
-serde_json = { version = "1.0.138", default-features = false, features = ["alloc"] }
+serde = { version = "1.0.218", features = ["alloc", "derive"], default-features = false }
+serde_json = { version = "1.0.139", default-features = false, features = ["alloc"] }
 adv-shift-registers = "0.2.5"
 embedded-hal = "1.0.0"
 esp-hal-mdns = "0.1.0"
@@ -30,17 +30,17 @@ macros = { path = "./macros" }
 nb = "1.1.0"
 embassy-futures = "0.1.1"
 embassy-sync = "0.6.2"
-ws-framer = { version = "0.2.2", features = ["alloc"] }
+ws-framer = { version = "=0.2.2", features = ["alloc"] }
 embedded-hal-async = "1.0.0"
-portable-atomic = { version = "1.10.0", default-features = false }
+portable-atomic = { version = "1.11.0", default-features = false }
 critical-section = "1.2.0"
 getrandom = { version = "0.2.15", features = ["custom"] }
-uuid = { version = "1.12.1", default-features = false, features = ["v4"] }
+uuid = { version = "=1.12.1", default-features = false, features = ["v4"] }
 dyn-smooth = "0.2.0"
-esp-hal-ota = { version = "0.3.2", features = [] }
-esp32c3 = { version = "0.27.0", optional = true }
-esp32 = { version = "0.35.0", optional = true }
-anyhow = { version = "1.0.95", default-features = false }
+esp-hal-ota = { version = "0.4.0", features = [] }
+esp32c3 = { version = "0.28.0", optional = true }
+esp32 = { version = "0.36.0", optional = true }
+anyhow = { version = "1.0.96", default-features = false }
 embedded-hal-bus = { version = "0.3.0", features = ["async"] }
 embedded-tls = { version = "0.17.0", default-features = false, features = ["alloc", "embedded-io-adapters", "log"] }
 rand_core = { version = "0.6.4", features = ["getrandom"] }

Cargo.toml

@@ -86,7 +86,7 @@ async fn wakeup_button(
     if sleep_state() {
         state.state.signal();
         if deeper_sleep_state() {
-            esp_hal::reset::software_reset();
+            esp_hal::system::software_reset();
         }
 
         return Ok(true);
@@ -337,9 +337,7 @@ async fn submit_reset_wifi(
     }
 
     Timer::after_millis(500).await;
-    esp_hal::reset::software_reset();
-
-    Ok(false)
+    esp_hal::system::software_reset();
 }
 
 #[macros::button_handler]

src/buttons.rs

@@ -23,9 +23,6 @@ use structs::ConnSettings;
 use utils::{logger::FkmLogger, set_brownout_detection};
 use ws_framer::{WsUrl, WsUrlOwned};
 
-#[cfg(feature = "esp32")]
-use esp_hal::time::RateExtU32;
-
 mod battery;
 mod buttons;
 mod consts;
@@ -62,12 +59,12 @@ async fn main(spawner: Spawner) {
 
         #[cfg(feature = "esp32")]
         {
-            config.cpu_clock = esp_hal::clock::CpuClock::_80MHz;
+            config = config.with_cpu_clock(esp_hal::clock::CpuClock::_80MHz);
         }
 
         #[cfg(feature = "esp32c3")]
         {
-            config.cpu_clock = esp_hal::clock::CpuClock::_80MHz;
+            config = config.with_cpu_clock(esp_hal::clock::CpuClock::_80MHz);
         }
 
         config
@@ -79,7 +76,7 @@ async fn main(spawner: Spawner) {
 
     #[cfg(not(feature = "esp32"))]
     {
-        esp_alloc::heap_allocator!(120 * 1024);
+        esp_alloc::heap_allocator!(size: 120 * 1024);
     }
 
     {
@@ -123,11 +120,23 @@ async fn main(spawner: Spawner) {
     #[cfg(feature = "esp32")]
     let stackmat_rx = peripherals.GPIO4.degrade();
     #[cfg(feature = "esp32")]
-    let shifter_data_pin = Output::new(peripherals.GPIO16, esp_hal::gpio::Level::Low);
+    let shifter_data_pin = Output::new(
+        peripherals.GPIO16,
+        esp_hal::gpio::Level::Low,
+        Default::default(),
+    );
     #[cfg(feature = "esp32")]
-    let shifter_clk_pin = Output::new(peripherals.GPIO12, esp_hal::gpio::Level::Low);
+    let shifter_clk_pin = Output::new(
+        peripherals.GPIO12,
+        esp_hal::gpio::Level::Low,
+        Default::default(),
+    );
     #[cfg(feature = "esp32")]
-    let shifter_latch_pin = Output::new(peripherals.GPIO17, esp_hal::gpio::Level::Low);
+    let shifter_latch_pin = Output::new(
+        peripherals.GPIO17,
+        esp_hal::gpio::Level::Low,
+        Default::default(),
+    );
 
     #[cfg(feature = "esp32c3")]
     let sck = peripherals.GPIO4.degrade();
@@ -140,11 +149,23 @@ async fn main(spawner: Spawner) {
     #[cfg(feature = "esp32c3")]
     let stackmat_rx = peripherals.GPIO20.degrade();
     #[cfg(feature = "esp32c3")]
-    let shifter_data_pin = Output::new(peripherals.GPIO10, esp_hal::gpio::Level::Low);
+    let shifter_data_pin = Output::new(
+        peripherals.GPIO10,
+        esp_hal::gpio::Level::Low,
+        Default::default(),
+    );
     #[cfg(feature = "esp32c3")]
-    let shifter_latch_pin = Output::new(peripherals.GPIO1, esp_hal::gpio::Level::Low);
+    let shifter_latch_pin = Output::new(
+        peripherals.GPIO1,
+        esp_hal::gpio::Level::Low,
+        Default::default(),
+    );
     #[cfg(feature = "esp32c3")]
-    let shifter_clk_pin = Output::new(peripherals.GPIO21, esp_hal::gpio::Level::Low);
+    let shifter_clk_pin = Output::new(
+        peripherals.GPIO21,
+        esp_hal::gpio::Level::Low,
+        Default::default(),
+    );
 
     let mut adv_shift_reg = adv_shift_registers::AdvancedShiftRegister::<8, _>::new(
         shifter_data_pin,
@@ -164,16 +185,31 @@ async fn main(spawner: Spawner) {
         .set_data(&[!crate::utils::stackmat::DEC_DIGITS[8] ^ crate::utils::stackmat::DOT_MOD; 6]);
 
     #[cfg(feature = "esp32")]
-    let button_1 = Input::new(peripherals.GPIO27, esp_hal::gpio::Pull::Up);
+    let button_1 = Input::new(
+        peripherals.GPIO27,
+        esp_hal::gpio::InputConfig::default().with_pull(esp_hal::gpio::Pull::Down),
+    );
     #[cfg(feature = "esp32")]
-    let button_2 = Input::new(peripherals.GPIO26, esp_hal::gpio::Pull::Up);
+    let button_2 = Input::new(
+        peripherals.GPIO26,
+        esp_hal::gpio::InputConfig::default().with_pull(esp_hal::gpio::Pull::Down),
+    );
     #[cfg(feature = "esp32")]
-    let button_3 = Input::new(peripherals.GPIO33, esp_hal::gpio::Pull::Up);
+    let button_3 = Input::new(
+        peripherals.GPIO33,
+        esp_hal::gpio::InputConfig::default().with_pull(esp_hal::gpio::Pull::Down),
+    );
     #[cfg(feature = "esp32")]
-    let button_4 = Input::new(peripherals.GPIO32, esp_hal::gpio::Pull::Up);
+    let button_4 = Input::new(
+        peripherals.GPIO32,
+        esp_hal::gpio::InputConfig::default().with_pull(esp_hal::gpio::Pull::Down),
+    );
 
     #[cfg(feature = "esp32c3")]
-    let button_input = Input::new(peripherals.GPIO3, esp_hal::gpio::Pull::Down);
+    let button_input = Input::new(
+        peripherals.GPIO3,
+        esp_hal::gpio::InputConfig::default().with_pull(esp_hal::gpio::Pull::Down),
+    );
 
     #[cfg(feature = "esp32c3")]
     let buttons_shifter = adv_shift_reg.get_shifter_mut(0);
@@ -191,7 +227,11 @@ async fn main(spawner: Spawner) {
     };
 
     #[cfg(feature = "esp32")]
-    let cs_pin = Output::new(peripherals.GPIO5, esp_hal::gpio::Level::High);
+    let cs_pin = Output::new(
+        peripherals.GPIO5,
+        esp_hal::gpio::Level::High,
+        Default::default(),
+    );
 
     let global_state = Rc::new(GlobalStateInner::new(&nvs));
     let wifi_setup_sig = Rc::new(Signal::new());
@@ -200,7 +240,7 @@ async fn main(spawner: Spawner) {
     let i2c = esp_hal::i2c::master::I2c::new(
         peripherals.I2C0,
         esp_hal::i2c::master::Config::default()
-            .with_frequency(100.kHz())
+            .with_frequency(esp_hal::time::Rate::from_khz(100))
             .with_timeout(esp_hal::i2c::master::BusTimeout::Maximum),
     )
     .expect("I2C new failed")
@@ -289,8 +329,7 @@ async fn main(spawner: Spawner) {
     let Ok(mut wifi_res) = wifi_res else {
         log::error!("WifiManager failed!!! Restarting in 1s!");
         Timer::after_millis(1000).await;
-        esp_hal::reset::software_reset();
-        return;
+        esp_hal::system::software_reset();
     };
 
     let conn_settings: ConnSettings = wifi_res
@@ -324,7 +363,7 @@ async fn main(spawner: Spawner) {
                     _ = nvs.invalidate_key(WIFI_NVS_KEY).await;
                     Timer::after_millis(1000).await;
 
-                    esp_hal::reset::software_reset();
+                    esp_hal::system::software_reset();
                 }
 
                 continue;

src/main.rs

@@ -26,7 +26,9 @@ pub async fn mdns_query(stack: Stack<'static>) -> heapless::String<255> {
     _ = stack.join_multicast_group(ip_addr);
 
     let mut mdns = MdnsQuery::new("_stackmat._tcp.local", MDNS_RESEND_INTERVAL, || {
-        esp_hal::time::now().duration_since_epoch().to_millis()
+        esp_hal::time::Instant::now()
+            .duration_since_epoch()
+            .as_millis()
     });
     let mut data_buf = [0; 1024];
 

src/mdns.rs

@@ -5,12 +5,12 @@ use crate::translations::{get_translation, TranslationKey};
 use alloc::string::ToString;
 use anyhow::{anyhow, Result};
 use embassy_time::{Duration, Timer};
+use esp_hal::time::Rate;
 use esp_hal::{
     dma::{DmaRxBuf, DmaTxBuf},
     dma_buffers,
     gpio::AnyPin,
     spi::{master::Spi, Mode},
-    time::RateExtU32,
 };
 
 #[cfg(feature = "esp32")]
@@ -40,7 +40,7 @@ pub async fn rfid_task(
     let spi = Spi::new(
         spi,
         esp_hal::spi::master::Config::default()
-            .with_frequency(400.kHz())
+            .with_frequency(Rate::from_khz(400))
             .with_mode(Mode::_0),
     )
     .expect("Spi init failed")

src/rfid.rs

@@ -23,11 +23,11 @@ pub async fn stackmat_task(
         .with_rx(uart_pin);
 
     #[cfg(feature = "e2e")]
-    let mut e2e_data = (StackmatTimerState::Reset, 0, esp_hal::time::now());
+    let mut e2e_data = (StackmatTimerState::Reset, 0, esp_hal::time::Instant::now());
 
     let mut buf = [0; 8];
     let mut read_buf = [0; 8];
-    let mut last_read = esp_hal::time::now();
+    let mut last_read = esp_hal::time::Instant::now();
     let mut last_state = None;
     let mut last_stackmat_state = StackmatTimerState::Unknown;
     loop {
@@ -36,7 +36,9 @@ pub async fn stackmat_task(
             continue;
         }
 
-        if (esp_hal::time::now() - last_read).to_millis() > 500 && last_state != Some(false) {
+        if (esp_hal::time::Instant::now() - last_read).as_millis() > 500
+            && last_state != Some(false)
+        {
             global_state.state.lock().await.stackmat_connected = Some(false);
             last_state = Some(false);
             display.set_data(&[255; 6]);
@@ -53,14 +55,14 @@ pub async fn stackmat_task(
                 let data = global_state.e2e.stackmat_sig.wait().await;
                 e2e_data.0 = data.0;
                 e2e_data.1 = data.1;
-                e2e_data.2 = esp_hal::time::now();
+                e2e_data.2 = esp_hal::time::Instant::now();
             }
 
             let timer_ms = match e2e_data.0 {
                 StackmatTimerState::Unknown => 0,
                 StackmatTimerState::Reset => 0,
                 StackmatTimerState::Running => {
-                    let mut time = (esp_hal::time::now() - e2e_data.2).to_millis();
+                    let mut time = (esp_hal::time::Instant::now() - e2e_data.2).as_millis();
                     if time >= e2e_data.1 {
                         time = e2e_data.1;
                         e2e_data.0 = StackmatTimerState::Stopped;
@@ -82,7 +84,7 @@ pub async fn stackmat_task(
 
         #[cfg(not(feature = "e2e"))]
         let n = {
-            let n = uart.read_buffered_bytes(&mut read_buf);
+            let n = uart.read_buffered(&mut read_buf);
             let Ok(n) = n else {
                 log::error!("uart: read_bytes err");
                 continue;
@@ -211,6 +213,6 @@ pub async fn stackmat_task(
             }
         }
 
-        last_read = esp_hal::time::now();
+        last_read = esp_hal::time::Instant::now();
     }
 }

src/stackmat.rs

@@ -224,5 +224,5 @@ pub extern "Rust" fn custom_pre_backtrace() {
 
 #[no_mangle]
 pub extern "Rust" fn custom_halt() {
-    esp_hal::reset::software_reset();
+    esp_hal::system::software_reset();
 }

src/utils/backtrace_store.rs

@@ -73,12 +73,12 @@ impl ButtonsHandler {
 
         #[cfg(feature = "esp32")] buttons: &[Input<'static>],
     ) {
-        let mut debounce_time = esp_hal::time::now();
+        let mut debounce_time = esp_hal::time::Instant::now();
         let mut old_debounced = i32::MAX;
         let mut old_val = 0;
 
         #[cfg(feature = "e2e")]
-        let mut e2e_data = (esp_hal::time::now(), 0, 0);
+        let mut e2e_data = (esp_hal::time::Instant::now(), 0, 0);
 
         #[cfg(feature = "e2e")]
         let mut send_ack = false;
@@ -92,13 +92,13 @@ impl ButtonsHandler {
                     let (btn_idx, press_ms) = state.e2e.buttons_sig.wait().await;
                     out_val |= 1 << btn_idx;
 
-                    e2e_data.0 = esp_hal::time::now();
+                    e2e_data.0 = esp_hal::time::Instant::now();
                     e2e_data.1 = press_ms;
                     e2e_data.2 = btn_idx;
                     send_ack = true;
 
                     log::debug!("[E2E] Button pressed: {btn_idx} for {press_ms}ms");
-                } else if (esp_hal::time::now() - e2e_data.0).to_millis() <= e2e_data.1 {
+                } else if (esp_hal::time::Instant::now() - e2e_data.0).as_millis() <= e2e_data.1 {
                     out_val |= 1 << e2e_data.2;
                 }
             }
@@ -127,10 +127,10 @@ impl ButtonsHandler {
 
             if old_val != out_val {
                 old_val = out_val;
-                debounce_time = esp_hal::time::now();
+                debounce_time = esp_hal::time::Instant::now();
             } else if old_debounced != out_val {
-                let duration = esp_hal::time::now() - debounce_time;
-                if duration.to_millis() > 50 || sleep_state() {
+                let duration = esp_hal::time::Instant::now() - debounce_time;
+                if duration.as_millis() > 50 || sleep_state() {
                     if old_debounced == 0 {
                         self.button_down((out_val as u8).into(), state).await;
                     } else {
@@ -146,7 +146,7 @@ impl ButtonsHandler {
                     old_debounced = out_val;
                 }
             } else {
-                debounce_time = esp_hal::time::now();
+                debounce_time = esp_hal::time::Instant::now();
             }
 
             if old_debounced != 0 {