Update esp-hal

Cargo.toml

@@ -53,7 +53,7 @@ smoltcp = { version = "0.10.0", default-features = false, features = [
 [dependencies]
 embassy-futures = { version = "0.1.0" }
 embassy-executor = { workspace = true }
-embassy-time = { version = "0.1.3", features = ["nightly", "unstable-traits"] }
+embassy-time = { version = "0.1.4", features = ["nightly", "unstable-traits"] }
 
 embedded-hal-old = { package = "embedded-hal", version = "0.2.7" }
 
@@ -98,6 +98,7 @@ config-site = { path = "config-site", default-features = false, features = [
 ] }
 critical-section = "1.1"
 device-descriptor = { path = "device-descriptor" }
+fugit = "0.3.7"
 register-access = { path = "register-access" }
 gui = { path = "gui" }
 macros = { path = "macros" }
@@ -142,7 +143,7 @@ smoltcp = { workspace = true }
 crc = "3.0.1"
 
 [patch.crates-io]
-esp32s3-hal = { git = "https://github.com/esp-rs/esp-hal.git", rev = "44e968f7a83f80be43d60cdc01c10eccab4b39cf" }
+esp32s3-hal = { git = "https://github.com/esp-rs/esp-hal.git", rev = "0c8dd59163472133870a62b6248f50953f02defc" }
 # esp32s3-hal = { path = "../../esp-hal/esp32s3-hal" }
 # esp-hal-common = { path = "../../esp-hal/esp-hal-common" }
 # esp-wifi = { path = "../esp-wifi/esp-wifi" }

src/board/hardware/v1.rs

@@ -13,7 +13,7 @@ use crate::board::{
         gpio::{Analog, Floating, GpioPin, Input, Output, PullUp, PushPull},
         peripherals::{self, Peripherals},
         prelude::*,
-        spi::{dma::SpiDma, FullDuplexMode},
+        spi::{master::dma::SpiDma, FullDuplexMode},
         systimer::SystemTimer,
         Rtc, IO,
     },

src/board/hardware/v2.rs

@@ -25,7 +25,7 @@ use crate::board::{
         interrupt,
         peripherals::{self, Peripherals},
         prelude::*,
-        spi::{dma::SpiDma, FullDuplexMode},
+        spi::{master::dma::SpiDma, FullDuplexMode},
         systimer::SystemTimer,
         Rtc, IO,
     },

src/board/hardware/v4.rs

@@ -16,7 +16,7 @@ use crate::board::{
         interrupt,
         peripherals::{self, Peripherals},
         prelude::*,
-        spi::{dma::SpiDma, FullDuplexMode},
+        spi::{master::dma::SpiDma, FullDuplexMode},
         systimer::SystemTimer,
         Rtc, IO,
     },

src/board/startup.rs

@@ -1,6 +1,7 @@
 use display_interface_spi::SPIInterface;
 use embassy_executor::_export::StaticCell;
 use embassy_time::Delay;
+use embedded_hal::digital::OutputPin;
 use embedded_hal_bus::spi::ExclusiveDevice;
 
 #[cfg(feature = "battery_adc")]
@@ -14,10 +15,16 @@ use crate::{
         hal::{
             clock::Clocks,
             dma::DmaPriority,
+            gpio::OutputPin as _,
             interrupt, peripherals,
-            prelude::*,
-            spi::{dma::WithDmaSpi3, SpiMode},
-            Rtc, Spi,
+            spi::{
+                master::{
+                    dma::{WithDmaSpi2, WithDmaSpi3},
+                    Instance, Spi,
+                },
+                SpiMode,
+            },
+            Rtc,
         },
         utils::DummyOutputPin,
         wifi::WifiDriver,
@@ -30,6 +37,7 @@ use crate::{
 };
 #[cfg(feature = "log")]
 use esp_println::logger::init_logger;
+use fugit::RateExtU32;
 
 pub static WIFI_DRIVER: StaticCell<WifiDriver> = StaticCell::new();