From 7fd35e0152193ae44b75561508ca3ce7c35e056f Mon Sep 17 00:00:00 2001 From: Ronald Weber Date: Thu, 27 Mar 2025 21:16:22 +0100 Subject: [PATCH] examples/esp32c3: Update esp-hal to 1.0.0-beta.0 --- examples/esp32c3/Cargo.lock | 105 ++++++++++++++----------- examples/esp32c3/Cargo.toml | 2 +- examples/esp32c3/examples/sw_and_hw.rs | 7 +- 3 files changed, 66 insertions(+), 48 deletions(-) diff --git a/examples/esp32c3/Cargo.lock b/examples/esp32c3/Cargo.lock index b84db40606d..cac97ed12dc 100644 --- a/examples/esp32c3/Cargo.lock +++ b/examples/esp32c3/Cargo.lock @@ -31,9 +31,23 @@ dependencies = [ [[package]] name = "bitfield" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f798d2d157e547aa99aab0967df39edd0b70307312b6f8bd2848e6abe40896e0" +checksum = "4c7e6caee68becd795bfd65f1a026e4d00d8f0c2bc9be5eb568e1015f9ce3c34" +dependencies = [ + "bitfield-macros", +] + +[[package]] +name = "bitfield-macros" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "331afbb18ce7b644c0b428726d369c5dd37ca0b815d72a459fcc2896c3c8ad32" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "bitflags" @@ -111,9 +125,9 @@ dependencies = [ [[package]] name = "delegate" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297806318ef30ad066b15792a8372858020ae3ca2e414ee6c2133b1eb9e9e945" +checksum = "b9b6483c2bbed26f97861cf57651d4f2b731964a28cd2257f934a4b452480d21" dependencies = [ "proc-macro2", "quote", @@ -225,16 +239,6 @@ dependencies = [ "embedded-hal 1.0.0", ] -[[package]] -name = "embedded-hal-nb" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba4268c14288c828995299e59b12babdbe170f6c6d73731af1b4648142e8605" -dependencies = [ - "embedded-hal 1.0.0", - "nb 1.1.0", -] - [[package]] name = "embedded-io" version = "0.6.1" @@ -336,9 +340,9 @@ dependencies = [ [[package]] name = "esp-hal" -version = "0.23.1" +version = "1.0.0-beta.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a573175c540fd1d21a9cf07b0dee286b5a8f4cfde4b35da0f4f4657de7942c45" +checksum = "e9efaa9c1324ca20a22086aba2ce47a9bdc5bd65969af8b0cd5e879603b57bef" dependencies = [ "basic-toml", "bitfield", @@ -355,7 +359,6 @@ dependencies = [ "embedded-can", "embedded-hal 1.0.0", "embedded-hal-async", - "embedded-hal-nb", "embedded-io", "embedded-io-async", "enumset", @@ -364,7 +367,7 @@ dependencies = [ "esp-hal-procmacros", "esp-metadata", "esp-riscv-rt", - "esp32c3 0.27.0", + "esp32c3", "fugit", "instability", "nb 1.1.0", @@ -373,7 +376,7 @@ dependencies = [ "rand_core", "riscv", "serde", - "strum", + "strum 0.27.1", "ufmt-write", "void", "xtensa-lx", @@ -382,9 +385,9 @@ dependencies = [ [[package]] name = "esp-hal-procmacros" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a3297005c2b31cd00e2ba50037edc9bddf99da3afe1c97a2d1b0165a312eab" +checksum = "1bd340a20a7d546570af58fd9e2aae17466a42572680d8e70d35fc7c475c4ed8" dependencies = [ "darling", "document-features", @@ -398,14 +401,14 @@ dependencies = [ [[package]] name = "esp-metadata" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb15c17e50f4cccb0d88305c19eae2d5533d750f0a05b6a05f1c99864974758e" +checksum = "30b4bffc22b7b1222c9467f0cb90eb49dcb63de810ecb3300e4b3bbc4ac2423e" dependencies = [ "anyhow", "basic-toml", "serde", - "strum", + "strum 0.26.3", ] [[package]] @@ -422,9 +425,9 @@ dependencies = [ [[package]] name = "esp-riscv-rt" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94aca65db6157aa5f42d9df6595b21462f28207ca4230b799aa3620352ef6a72" +checksum = "ec69987b3d7c48b65f8fb829220832a101478d766c518ae836720d040608d5dd" dependencies = [ "document-features", "riscv", @@ -438,21 +441,11 @@ dependencies = [ "esp-backtrace", "esp-hal", "esp-println", - "esp32c3 0.28.0", + "esp32c3", "rtic", "rtic-monotonics", ] -[[package]] -name = "esp32c3" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61655d48e45039dfac5ae769581fb50ea7f61dea3227b4b744a1a900d03fbbd4" -dependencies = [ - "critical-section", - "vcell", -] - [[package]] name = "esp32c3" version = "0.28.0" @@ -591,9 +584,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "memchr" @@ -751,9 +744,9 @@ checksum = "8188909339ccc0c68cfb5a04648313f09621e8b87dc03095454f1a11f6c5d436" [[package]] name = "riscv-rt-macros" -version = "0.2.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30f19a85fe107b65031e0ba8ec60c34c2494069fe910d6c297f5e7cb5a6f76d0" +checksum = "fc71814687c45ba4cd1e47a54e03a2dbc62ca3667098fbae9cc6b423956758fa" dependencies = [ "proc-macro2", "quote", @@ -766,7 +759,7 @@ version = "2.1.2" dependencies = [ "bare-metal", "critical-section", - "esp32c3 0.28.0", + "esp32c3", "portable-atomic", "riscv", "rtic-core", @@ -803,7 +796,7 @@ name = "rtic-monotonics" version = "2.0.3" dependencies = [ "cfg-if", - "esp32c3 0.28.0", + "esp32c3", "fugit", "portable-atomic", "riscv", @@ -875,7 +868,16 @@ version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "strum_macros", + "strum_macros 0.26.4", +] + +[[package]] +name = "strum" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" +dependencies = [ + "strum_macros 0.27.1", ] [[package]] @@ -891,6 +893,19 @@ dependencies = [ "syn", ] +[[package]] +name = "strum_macros" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + [[package]] name = "syn" version = "2.0.100" @@ -1082,7 +1097,7 @@ dependencies = [ "minijinja", "r0", "serde", - "strum", + "strum 0.26.3", "toml", "xtensa-lx", "xtensa-lx-rt-proc-macros", diff --git a/examples/esp32c3/Cargo.toml b/examples/esp32c3/Cargo.toml index 2f00ff80ec3..88ff0aff686 100644 --- a/examples/esp32c3/Cargo.toml +++ b/examples/esp32c3/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" [dependencies] rtic = { path = "../../rtic/" } rtic-monotonics = {path = "../../rtic-monotonics/"} -esp-hal = { version = "0.23.1", features = ["esp32c3"] } +esp-hal = { version = "1.0.0-beta.0", features = ["esp32c3", "unstable"] } esp-backtrace = { version = "0.15.0", features = [ "esp32c3", "panic-handler", diff --git a/examples/esp32c3/examples/sw_and_hw.rs b/examples/esp32c3/examples/sw_and_hw.rs index 80b0512c90e..e8952eca8f4 100644 --- a/examples/esp32c3/examples/sw_and_hw.rs +++ b/examples/esp32c3/examples/sw_and_hw.rs @@ -3,7 +3,7 @@ #[rtic::app(device = esp32c3, dispatchers=[FROM_CPU_INTR0, FROM_CPU_INTR1])] mod app { use esp_backtrace as _; - use esp_hal::gpio::{Event, Input, Pull}; + use esp_hal::gpio::{Event, Input, InputConfig, Pull}; use esp_println::println; #[shared] @@ -19,7 +19,10 @@ mod app { fn init(_: init::Context) -> (Shared, Local) { println!("init"); let peripherals = esp_hal::init(esp_hal::Config::default()); - let mut button = Input::new(peripherals.GPIO9, Pull::Up); + let mut button = Input::new( + peripherals.GPIO9, + InputConfig::default().with_pull(Pull::Up), + ); button.listen(Event::FallingEdge); foo::spawn().unwrap(); (Shared {}, Local { button })