Update to SPI driver simplification PR

card-io-ecg · Sep 29, 2024 · 4b2141e · 4b2141e
1 parent 2983708
commit 4b2141e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -132,12 +132,12 @@ crc = "3.0.1"
 enumset = "1.1.3"
 
 [patch.crates-io]
-esp-hal = { git = "https://github.com/bugadani/esp-hal.git", rev = "2a74addee03970f1f79522b96dea285c947ac329" }
-esp-hal-embassy = { git = "https://github.com/bugadani/esp-hal.git", rev = "2a74addee03970f1f79522b96dea285c947ac329" }
-esp-wifi = { git = "https://github.com/bugadani/esp-hal.git", rev = "2a74addee03970f1f79522b96dea285c947ac329" }
-esp-backtrace = { git = "https://github.com/bugadani/esp-hal.git", rev = "2a74addee03970f1f79522b96dea285c947ac329" }
-esp-println = { git = "https://github.com/bugadani/esp-hal.git", rev = "2a74addee03970f1f79522b96dea285c947ac329" }
-esp-alloc = { git = "https://github.com/bugadani/esp-hal.git", rev = "2a74addee03970f1f79522b96dea285c947ac329" }
+esp-hal = { git = "https://github.com/bugadani/esp-hal.git", rev = "1423f84" }
+esp-hal-embassy = { git = "https://github.com/bugadani/esp-hal.git", rev = "1423f84" }
+esp-wifi = { git = "https://github.com/bugadani/esp-hal.git", rev = "1423f84" }
+esp-backtrace = { git = "https://github.com/bugadani/esp-hal.git", rev = "1423f84" }
+esp-println = { git = "https://github.com/bugadani/esp-hal.git", rev = "1423f84" }
+esp-alloc = { git = "https://github.com/bugadani/esp-hal.git", rev = "1423f84" }
 
 [features]
 default = ["defmt"]

diff --git a/src/board/hardware/v4.rs b/src/board/hardware/v4.rs
@@ -28,7 +28,7 @@ use esp_hal::{
 use display_interface_spi::SPIInterface;
 
 pub type DisplaySpiInstance = peripherals::SPI2;
-pub type DisplayDmaChannel = ChannelCreator0;
+pub type DisplayDmaChannel = ChannelCreator<0>;
 
 pub type DisplayInterface<'a> = SPIInterface<DisplaySpi<'a>, Output<'static>>;
 pub type DisplaySpi<'d> = ExclusiveDevice<
@@ -37,7 +37,7 @@ pub type DisplaySpi<'d> = ExclusiveDevice<
     Delay,
 >;
 
-pub type AdcDmaChannel = ChannelCreator1;
+pub type AdcDmaChannel = ChannelCreator<1>;
 pub type AdcSpiInstance = peripherals::SPI3;
 
 pub type AdcSpi = ExclusiveDevice<