Skip to content

Commit

Permalink
update hal to 0.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
georgik committed Dec 18, 2023
1 parent 53a21ae commit 3630309
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "esp32-conways-game-of-life-rs"
version = "0.3.0"
version = "0.4.0"
authors = ["Juraj Michálek <[email protected]>"]
edition = "2021"
license = "MIT OR Apache-2.0"

[dependencies]
hal = { package = "esp32s3-hal", version = "0.13.0" }
hal = { package = "esp32s3-hal", version = "0.14.0" }
esp-backtrace = { version = "0.9.0", features = ["esp32s3", "panic-handler", "exception-handler", "print-uart"] }
esp-println = { version = "0.7.0", features = ["esp32s3","log"] }
log = { version = "0.4.18" }
Expand All @@ -17,4 +17,4 @@ display-interface = "0.4.1"
display-interface-spi = "0.4.1"
heapless = "0.8.0"
embedded-dma = "0.2.0"
spi-dma-displayinterface = { git = "https://github.com/georgik/esp32-spooky-maze-game.git", package = "spi-dma-displayinterface", features = [ "esp32s3" ], rev = "ad47396" }
spi-dma-displayinterface = { git = "https://github.com/georgik/esp32-spooky-maze-game.git", package = "spi-dma-displayinterface", features = [ "esp32s3" ], rev = "fb5f755" }
17 changes: 9 additions & 8 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ fn main() -> ! {
println!("About to initialize the SPI LED driver");
let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);

let sclk = io.pins.gpio7;
let mosi = io.pins.gpio6;
let cs = io.pins.gpio5;
let miso = io.pins.gpio2;
let lcd_sclk = io.pins.gpio7;
let lcd_mosi = io.pins.gpio6;
let lcd_cs = io.pins.gpio5;
let lcd_miso = io.pins.gpio2;
// let sda = io.pins.gpio8;
// let scl = io.pins.gpio18;
let dc = io.pins.gpio4.into_push_pull_output();
Expand All @@ -185,13 +185,14 @@ fn main() -> ! {

let spi = Spi::new(
peripherals.SPI2,
sclk,
mosi,
miso,
cs,
60u32.MHz(),
SpiMode::Mode0,
&clocks,
).with_pins(
Some(lcd_sclk),
Some(lcd_mosi),
Some(lcd_miso),
Some(lcd_cs),
)
.with_dma(dma_channel.configure(
false,
Expand Down

0 comments on commit 3630309

Please sign in to comment.