Skip to content

Commit 156bea0

Browse files
committed
wip: upgrade to newer hal
1 parent 5af6ca9 commit 156bea0

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Cargo.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@ license = "MIT OR Apache-2.0"
77

88

99
[dependencies]
10-
esp-hal = "0.22.0"
11-
esp-backtrace = { version = "0.14.2", features = [
10+
esp-hal = "0.23.1"
11+
esp-backtrace = { version = "0.15.0", features = [
1212
"panic-handler",
1313
"println"
1414
] }
15-
esp-println = { version = "0.12.0", features = [ "log" ] }
15+
esp-println = { version = "0.13.0", features = [ "log" ] }
1616
log = { version = "0.4.21" }
1717

18-
esp-alloc = "0.5.0"
18+
esp-alloc = "0.6.0"
1919
embedded-graphics = "0.8.0"
2020
embedded-hal = "1.0.0"
21-
mipidsi = "0.8.0"
22-
esp-display-interface-spi-dma = "0.2.0"
21+
mipidsi = "0.9.0"
22+
#esp-display-interface-spi-dma = "0.3.0"
23+
esp-display-interface-spi-dma = { path = "../esp-display-interface-spi-dma"}
2324
esp-bsp = "0.4.1"
2425
embedded-graphics-framebuf = { version = "0.3.0", git = "https://github.com/georgik/embedded-graphics-framebuf.git", branch = "feature/embedded-graphics-0.8" }
2526
heapless = "0.8.0"

src/main.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ use esp_hal::gpio::Pull;
2020
use esp_hal::rng::Rng;
2121
use esp_hal::{
2222
delay::Delay,
23-
dma::Dma,
2423
dma::DmaPriority,
2524
gpio::{Level, Output},
26-
prelude::*,
2725
spi::master::Spi,
26+
main
2827
};
2928

3029
use embedded_graphics_framebuf::FrameBuf;
@@ -156,7 +155,7 @@ fn draw_grid<D: DrawTarget<Color = Rgb565>>(
156155
Ok(())
157156
}
158157

159-
#[entry]
158+
#[main]
160159
fn main() -> ! {
161160
let peripherals = esp_hal::init(esp_hal::Config::default());
162161
esp_println::logger::init_logger_from_env();

0 commit comments

Comments
 (0)