Skip to content

Commit

Permalink
Merge pull request #162 from card-io-ecg/hal
Browse files Browse the repository at this point in the history 
Update esp-hal
  • Loading branch information
@bugadani
bugadani committed Feb 25, 2024
2 parents 00650a0 + f87b82f commit 256a402
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
18 changes: 9 additions & 9 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,15 @@ crc = "3.0.1"
enumset = "1.1.3"

[patch.crates-io]
esp32-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
esp32s2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
esp32s3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
esp32c2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
esp32c3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
esp32c6-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
esp32h2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
esp-hal-procmacros = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
esp-hal-common = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
esp32-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
esp32s2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
esp32s3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
esp32c2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
esp32c3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
esp32c6-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
esp32h2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
esp-hal-procmacros = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
esp-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
esp-wifi = { git = "https://github.com/esp-rs/esp-wifi", rev = "d200a167237f03cf63edce721a5f85fd65d2db84" }

[features]
Expand Down
4 changes: 2 additions & 2 deletions src/board/hardware/v1.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use crate::board::{
self,
adc::ADC2,
clock::ClockControl,
dma::*,
embassy,
gdma::*,
gpio::{Analog, Floating, GpioPin, Input, Output, PullUp, PushPull},
peripherals::{self, Peripherals},
prelude::*,
Expand Down Expand Up @@ -84,7 +84,7 @@ impl super::startup::StartupResources {

let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);

let dma = Gdma::new(peripherals.DMA);
let dma = Dma::new(peripherals.DMA);

let display = Self::create_display_driver(
dma.channel0,
Expand Down
4 changes: 2 additions & 2 deletions src/board/hardware/v2.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ use crate::board::{
hal::{
self,
clock::ClockControl,
dma::*,
embassy,
gdma::*,
gpio::{Floating, GpioPin, Input, Output, PullUp, PushPull},
peripherals::{self, Peripherals},
prelude::*,
Expand Down Expand Up @@ -113,7 +113,7 @@ impl super::startup::StartupResources {

let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);

let dma = Gdma::new(peripherals.DMA);
let dma = Dma::new(peripherals.DMA);

let display = Self::create_display_driver(
dma.channel0,
Expand Down
4 changes: 2 additions & 2 deletions src/board/hardware/v4.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use crate::board::{
hal::{
self,
clock::ClockControl,
dma::*,
embassy,
gdma::*,
gpio::{Floating, GpioPin, Input, Output, PullUp, PushPull, Unknown},
i2c::I2C,
peripherals::{self, Peripherals},
Expand Down Expand Up @@ -86,7 +86,7 @@ impl super::startup::StartupResources {

let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);

let dma = Gdma::new(peripherals.DMA);
let dma = Dma::new(peripherals.DMA);

let display = Self::create_display_driver(
dma.channel0,
Expand Down
4 changes: 2 additions & 2 deletions src/board/hardware/v6c6.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use crate::board::{
hal::{
self,
clock::ClockControl,
dma::*,
embassy,
gdma::*,
gpio::{Floating, GpioPin, Input, Output, PullUp, PushPull, Unknown},
i2c::I2C,
peripherals::{self, Peripherals},
Expand Down Expand Up @@ -82,7 +82,7 @@ impl super::startup::StartupResources {

let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);

let dma = Gdma::new(peripherals.DMA);
let dma = Dma::new(peripherals.DMA);

let display = Self::create_display_driver(
dma.channel0,
Expand Down
4 changes: 2 additions & 2 deletions src/board/hardware/v6s3.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use crate::board::{
hal::{
self,
clock::ClockControl,
dma::*,
embassy,
gdma::*,
gpio::{Floating, GpioPin, Input, Output, PullUp, PushPull, Unknown},
i2c::I2C,
peripherals::{self, Peripherals},
Expand Down Expand Up @@ -82,7 +82,7 @@ impl super::startup::StartupResources {

let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);

let dma = Gdma::new(peripherals.DMA);
let dma = Dma::new(peripherals.DMA);

let display = Self::create_display_driver(
dma.channel0,
Expand Down

0 comments on commit 256a402

Please sign in to comment.