diff --git a/advanced/stack-overflow-detection/Cargo.lock b/advanced/stack-overflow-detection/Cargo.lock index 342ecfa..b1d28dc 100644 --- a/advanced/stack-overflow-detection/Cargo.lock +++ b/advanced/stack-overflow-detection/Cargo.lock @@ -71,9 +71,9 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -81,27 +81,38 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.66", +] + +[[package]] +name = "delegate" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -177,7 +188,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -188,10 +199,11 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "esp-backtrace" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda6c53c50ed96cce44e8565bd7659f8884d55bac3262184c3a77f748553e3ff" +checksum = "613da39ca9dde7a2360ff1a273da78d9ff97e82ea095b520fb6b5dabf7192c6f" dependencies = [ + "esp-build", "esp-println", ] @@ -202,21 +214,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b94a4b8d74e7cc7baabcca5b2277b41877e039ad9cd49959d48ef94dac7eab4b" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.66", "termcolor", ] [[package]] name = "esp-hal" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e19440eb58fd1dd0c4f6722c953f7026571210c70ce69956d022faeb8fe4b4" +checksum = "44f1bf3b1b34bbeb59e24e630f26e21b95f9c2bb7c0a53361ae5a97c67936566" dependencies = [ "basic-toml", "bitfield", "bitflags", "cfg-if", "critical-section", + "delegate", "document-features", "embedded-can", "embedded-dma", @@ -242,9 +255,9 @@ dependencies = [ [[package]] name = "esp-hal-procmacros" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a9e9df075eb0c1e0a4349a4317c86b01be2acabe6f69d935c9c71d8a99e56a" +checksum = "788b535b8127a8f0d1f40a8d8e300e57a8c361c492d660dd08fe8e9a1b96ee3c" dependencies = [ "darling", "document-features", @@ -253,14 +266,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "esp-metadata" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a97109e81e9fb68cbf838ffda09cebbc9b25fe12f8b8a5e1b32391561e7c153" +checksum = "654b8f14bf076fe5995fe94fabbe41a98041e1f2f801e5b3404dcae87e476db6" dependencies = [ "basic-toml", "lazy_static", @@ -290,9 +303,9 @@ dependencies = [ [[package]] name = "esp32c3" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c22d8c27e7d675ef79db212b9e41df80aef6db1a5c819e4e726735f64ee0700" +checksum = "f117ffaf6cb5873e8ba4f78b969491fac3db459c08bf464af1e3b3fc5394692d" dependencies = [ "critical-section", "vcell", @@ -385,9 +398,9 @@ checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "portable-atomic" @@ -430,9 +443,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -516,22 +529,22 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -552,9 +565,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -594,7 +607,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -610,9 +623,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -731,5 +744,5 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] diff --git a/advanced/stack-overflow-detection/Cargo.toml b/advanced/stack-overflow-detection/Cargo.toml index 34b42f1..5878cc2 100644 --- a/advanced/stack-overflow-detection/Cargo.toml +++ b/advanced/stack-overflow-detection/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -esp-hal = { version = "0.17.0", features = ["esp32c3"] } -esp-backtrace = { version = "0.11.1", features = ["esp32c3", "panic-handler", "exception-handler", "println"] } +esp-hal = { version = "0.18.0", features = ["esp32c3"] } +esp-backtrace = { version = "0.12.0", features = ["esp32c3", "panic-handler", "exception-handler", "println"] } esp-println = { version = "0.9.1", features = ["esp32c3", "uart"] } critical-section = "1.1.2" diff --git a/advanced/stack-overflow-detection/examples/stack-overflow-detection.rs b/advanced/stack-overflow-detection/examples/stack-overflow-detection.rs index 595b106..c699de2 100644 --- a/advanced/stack-overflow-detection/examples/stack-overflow-detection.rs +++ b/advanced/stack-overflow-detection/examples/stack-overflow-detection.rs @@ -7,13 +7,14 @@ use critical_section::Mutex; use esp_backtrace as _; use esp_hal::{ assist_debug::DebugAssist, clock::ClockControl, peripherals::Peripherals, prelude::*, + system::SystemControl, }; use esp_println::println; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); let _ = ClockControl::boot_defaults(system.clock_control).freeze(); // get the debug assist driver diff --git a/advanced/stack-overflow-detection/src/main.rs b/advanced/stack-overflow-detection/src/main.rs index 89fb885..ac25efb 100644 --- a/advanced/stack-overflow-detection/src/main.rs +++ b/advanced/stack-overflow-detection/src/main.rs @@ -7,13 +7,14 @@ use critical_section::Mutex; use esp_backtrace as _; use esp_hal::{ assist_debug::DebugAssist, clock::ClockControl, peripherals::Peripherals, prelude::*, + system::SystemControl, }; use esp_println::println; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); let _ = ClockControl::boot_defaults(system.clock_control).freeze(); // get the debug assist driver diff --git a/book/src/03_2_blinky.md b/book/src/03_2_blinky.md index 2fd587d..7cbf077 100644 --- a/book/src/03_2_blinky.md +++ b/book/src/03_2_blinky.md @@ -27,7 +27,7 @@ On [ESP32-C3-DevKit-RUST-1] there is a regular [LED connected to GPIO 7]. If you > Note that most of the development boards from Espressif today use an addressable LED which works differently and is beyond the scope of this book. In that case, you can also connect a regular LED to some of the free pins (and don't forget to add a resistor). -✅ Initiate the IO peripheral, and create a `led` variable from GPIO connected to the LED, using the +✅ Initiate the Io peripheral, and create a `led` variable from GPIO connected to the LED, using the [`into_push_pull_output` function][into-push-pull-output]. Here we see that we can drive the pin `high`, `low`, or `toggle` it. diff --git a/book/src/03_3_button.md b/book/src/03_3_button.md index f21e321..570d0b7 100644 --- a/book/src/03_3_button.md +++ b/book/src/03_3_button.md @@ -27,7 +27,7 @@ cargo run --release --example button Most of the dev-boards have a button, in our case, we will use the one labeled [`BOOT` on `GPIO9`]. -✅ Initiate the IO peripheral, and create variable for the LED and button, the LED can be created using the +✅ Initiate the Io peripheral, and create variable for the LED and button, the LED can be created using the [`into_push_pull_output` function][into-push-pull-output] as before while the button can be obtained using [`into_pull_up_input` function][into-pull-up-input]. diff --git a/intro/blinky/Cargo.lock b/intro/blinky/Cargo.lock index e64d19c..f49ad34 100644 --- a/intro/blinky/Cargo.lock +++ b/intro/blinky/Cargo.lock @@ -80,9 +80,9 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -90,27 +90,38 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.66", +] + +[[package]] +name = "delegate" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -186,7 +197,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -197,10 +208,11 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "esp-backtrace" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda6c53c50ed96cce44e8565bd7659f8884d55bac3262184c3a77f748553e3ff" +checksum = "613da39ca9dde7a2360ff1a273da78d9ff97e82ea095b520fb6b5dabf7192c6f" dependencies = [ + "esp-build", "esp-println", ] @@ -211,21 +223,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b94a4b8d74e7cc7baabcca5b2277b41877e039ad9cd49959d48ef94dac7eab4b" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.66", "termcolor", ] [[package]] name = "esp-hal" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e19440eb58fd1dd0c4f6722c953f7026571210c70ce69956d022faeb8fe4b4" +checksum = "44f1bf3b1b34bbeb59e24e630f26e21b95f9c2bb7c0a53361ae5a97c67936566" dependencies = [ "basic-toml", "bitfield", "bitflags", "cfg-if", "critical-section", + "delegate", "document-features", "embedded-can", "embedded-dma", @@ -251,9 +264,9 @@ dependencies = [ [[package]] name = "esp-hal-procmacros" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a9e9df075eb0c1e0a4349a4317c86b01be2acabe6f69d935c9c71d8a99e56a" +checksum = "788b535b8127a8f0d1f40a8d8e300e57a8c361c492d660dd08fe8e9a1b96ee3c" dependencies = [ "darling", "document-features", @@ -262,14 +275,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "esp-metadata" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a97109e81e9fb68cbf838ffda09cebbc9b25fe12f8b8a5e1b32391561e7c153" +checksum = "654b8f14bf076fe5995fe94fabbe41a98041e1f2f801e5b3404dcae87e476db6" dependencies = [ "basic-toml", "lazy_static", @@ -299,9 +312,9 @@ dependencies = [ [[package]] name = "esp32c3" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c22d8c27e7d675ef79db212b9e41df80aef6db1a5c819e4e726735f64ee0700" +checksum = "f117ffaf6cb5873e8ba4f78b969491fac3db459c08bf464af1e3b3fc5394692d" dependencies = [ "critical-section", "vcell", @@ -394,9 +407,9 @@ checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "portable-atomic" @@ -439,9 +452,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -525,22 +538,22 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -551,9 +564,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -593,7 +606,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -609,9 +622,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -730,5 +743,5 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] diff --git a/intro/blinky/Cargo.toml b/intro/blinky/Cargo.toml index 62405f7..ea9f7fc 100644 --- a/intro/blinky/Cargo.toml +++ b/intro/blinky/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -esp-hal = { version = "0.17.0", features = ["esp32c3"] } -esp-backtrace = { version = "0.11.1", features = [ +esp-hal = { version = "0.18.0", features = ["esp32c3"] } +esp-backtrace = { version = "0.12.0", features = [ "esp32c3", "panic-handler", "exception-handler", diff --git a/intro/blinky/examples/blinky.rs b/intro/blinky/examples/blinky.rs index 85061a4..50cd050 100644 --- a/intro/blinky/examples/blinky.rs +++ b/intro/blinky/examples/blinky.rs @@ -2,20 +2,27 @@ #![no_main] use esp_backtrace as _; -use esp_hal::{clock::ClockControl, delay::Delay, gpio::IO, peripherals::Peripherals, prelude::*}; +use esp_hal::{ + clock::ClockControl, + delay::Delay, + gpio::{Io, Level, Output}, + peripherals::Peripherals, + prelude::*, + system::SystemControl, +}; use esp_println::println; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); println!("Hello world!"); // Set GPIO7 as an output, and set its state high initially. - let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); - let mut led = io.pins.gpio7.into_push_pull_output(); + let io = Io::new(peripherals.GPIO, peripherals.IO_MUX); + let mut led = Output::new(io.pins.gpio7, Level::Low); led.set_high(); diff --git a/intro/blinky/src/main.rs b/intro/blinky/src/main.rs index bd5ac6b..d9c50c1 100644 --- a/intro/blinky/src/main.rs +++ b/intro/blinky/src/main.rs @@ -2,13 +2,20 @@ #![no_main] use esp_backtrace as _; -use esp_hal::{clock::ClockControl, delay::Delay, gpio::IO, peripherals::Peripherals, prelude::*}; +use esp_hal::{ + clock::ClockControl, + delay::Delay, + gpio::{Io, Level, Output}, + peripherals::Peripherals, + prelude::*, + system::SystemControl, +}; use esp_println::println; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); println!("Hello world!"); diff --git a/intro/button-interrupt/Cargo.lock b/intro/button-interrupt/Cargo.lock index 68c62c0..550366e 100644 --- a/intro/button-interrupt/Cargo.lock +++ b/intro/button-interrupt/Cargo.lock @@ -81,9 +81,9 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -91,27 +91,38 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.66", +] + +[[package]] +name = "delegate" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -187,7 +198,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -198,10 +209,11 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "esp-backtrace" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda6c53c50ed96cce44e8565bd7659f8884d55bac3262184c3a77f748553e3ff" +checksum = "613da39ca9dde7a2360ff1a273da78d9ff97e82ea095b520fb6b5dabf7192c6f" dependencies = [ + "esp-build", "esp-println", ] @@ -212,21 +224,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b94a4b8d74e7cc7baabcca5b2277b41877e039ad9cd49959d48ef94dac7eab4b" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.66", "termcolor", ] [[package]] name = "esp-hal" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e19440eb58fd1dd0c4f6722c953f7026571210c70ce69956d022faeb8fe4b4" +checksum = "44f1bf3b1b34bbeb59e24e630f26e21b95f9c2bb7c0a53361ae5a97c67936566" dependencies = [ "basic-toml", "bitfield", "bitflags", "cfg-if", "critical-section", + "delegate", "document-features", "embedded-can", "embedded-dma", @@ -252,9 +265,9 @@ dependencies = [ [[package]] name = "esp-hal-procmacros" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a9e9df075eb0c1e0a4349a4317c86b01be2acabe6f69d935c9c71d8a99e56a" +checksum = "788b535b8127a8f0d1f40a8d8e300e57a8c361c492d660dd08fe8e9a1b96ee3c" dependencies = [ "darling", "document-features", @@ -263,14 +276,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "esp-metadata" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a97109e81e9fb68cbf838ffda09cebbc9b25fe12f8b8a5e1b32391561e7c153" +checksum = "654b8f14bf076fe5995fe94fabbe41a98041e1f2f801e5b3404dcae87e476db6" dependencies = [ "basic-toml", "lazy_static", @@ -300,9 +313,9 @@ dependencies = [ [[package]] name = "esp32c3" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c22d8c27e7d675ef79db212b9e41df80aef6db1a5c819e4e726735f64ee0700" +checksum = "f117ffaf6cb5873e8ba4f78b969491fac3db459c08bf464af1e3b3fc5394692d" dependencies = [ "critical-section", "vcell", @@ -395,9 +408,9 @@ checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "portable-atomic" @@ -440,9 +453,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -526,22 +539,22 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -552,9 +565,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -594,7 +607,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -610,9 +623,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -731,5 +744,5 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] diff --git a/intro/button-interrupt/Cargo.toml b/intro/button-interrupt/Cargo.toml index 5080d4f..032a04f 100644 --- a/intro/button-interrupt/Cargo.toml +++ b/intro/button-interrupt/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -esp-hal = { version = "0.17.0", features = ["esp32c3"] } -esp-backtrace = { version = "0.11.1", features = [ +esp-hal = { version = "0.18.0", features = ["esp32c3"] } +esp-backtrace = { version = "0.12.0", features = [ "esp32c3", "panic-handler", "exception-handler", diff --git a/intro/button-interrupt/examples/button-interrupt.rs b/intro/button-interrupt/examples/button-interrupt.rs index 5e177cc..fa4f0be 100644 --- a/intro/button-interrupt/examples/button-interrupt.rs +++ b/intro/button-interrupt/examples/button-interrupt.rs @@ -7,31 +7,31 @@ use esp_backtrace as _; use esp_hal::{ clock::ClockControl, delay::Delay, - gpio::{Event, Gpio9, Input, PullUp, IO}, - interrupt, + gpio::{Event, Gpio9, Input, Io, Level, Output, Pull}, peripherals::Peripherals, prelude::*, + system::SystemControl, }; use esp_println::println; -static BUTTON: Mutex>>>> = Mutex::new(RefCell::new(None)); +static BUTTON: Mutex>>> = Mutex::new(RefCell::new(None)); #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); println!("Hello world!"); - let mut io = IO::new(peripherals.GPIO, peripherals.IO_MUX); + let mut io = Io::new(peripherals.GPIO, peripherals.IO_MUX); // Set the interrupt handler for GPIO interrupts. io.set_interrupt_handler(handler); // Set GPIO7 as an output, and set its state high initially. - let mut led = io.pins.gpio7.into_push_pull_output(); + let mut led = Output::new(io.pins.gpio7, Level::Low); // Set GPIO9 as an input - let mut button = io.pins.gpio9.into_pull_up_input(); + let mut button = Input::new(io.pins.gpio9, Pull::Up); // ANCHOR: critical_section critical_section::with(|cs| { diff --git a/intro/button-interrupt/src/main.rs b/intro/button-interrupt/src/main.rs index 105d748..2ac070b 100644 --- a/intro/button-interrupt/src/main.rs +++ b/intro/button-interrupt/src/main.rs @@ -7,31 +7,31 @@ use esp_backtrace as _; use esp_hal::{ clock::ClockControl, delay::Delay, - gpio::{Event, Gpio9, Input, PullUp, IO}, - interrupt, + gpio::{self, Event, Gpio9, Input, Io, Level, Output, Pull}, peripherals::Peripherals, prelude::*, + system::SystemControl, }; use esp_println::println; -static BUTTON: Mutex>>>> = Mutex::new(RefCell::new(None)); +static BUTTON: Mutex>>> = Mutex::new(RefCell::new(None)); #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); println!("Hello world!"); - let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); + let io = Io::new(peripherals.GPIO, peripherals.IO_MUX); // Set the interrupt handler for GPIO interrupts. // Set GPIO7 as an output, and set its state high initially. - let mut led = io.pins.gpio7.into_push_pull_output(); + let mut led = Output::new(io.pins.gpio7, Level::Low); // Set GPIO9 as an input - let mut button = io.pins.gpio9.into_pull_up_input(); + let mut button = Input::new(io.pins.gpio9, Pull::Up); let delay = Delay::new(&clocks); loop {} diff --git a/intro/button/Cargo.lock b/intro/button/Cargo.lock index 2a85270..6237d2e 100644 --- a/intro/button/Cargo.lock +++ b/intro/button/Cargo.lock @@ -80,9 +80,9 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -90,27 +90,38 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.66", +] + +[[package]] +name = "delegate" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -186,7 +197,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -197,10 +208,11 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "esp-backtrace" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda6c53c50ed96cce44e8565bd7659f8884d55bac3262184c3a77f748553e3ff" +checksum = "613da39ca9dde7a2360ff1a273da78d9ff97e82ea095b520fb6b5dabf7192c6f" dependencies = [ + "esp-build", "esp-println", ] @@ -211,21 +223,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b94a4b8d74e7cc7baabcca5b2277b41877e039ad9cd49959d48ef94dac7eab4b" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.66", "termcolor", ] [[package]] name = "esp-hal" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e19440eb58fd1dd0c4f6722c953f7026571210c70ce69956d022faeb8fe4b4" +checksum = "44f1bf3b1b34bbeb59e24e630f26e21b95f9c2bb7c0a53361ae5a97c67936566" dependencies = [ "basic-toml", "bitfield", "bitflags", "cfg-if", "critical-section", + "delegate", "document-features", "embedded-can", "embedded-dma", @@ -251,9 +264,9 @@ dependencies = [ [[package]] name = "esp-hal-procmacros" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a9e9df075eb0c1e0a4349a4317c86b01be2acabe6f69d935c9c71d8a99e56a" +checksum = "788b535b8127a8f0d1f40a8d8e300e57a8c361c492d660dd08fe8e9a1b96ee3c" dependencies = [ "darling", "document-features", @@ -262,14 +275,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "esp-metadata" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a97109e81e9fb68cbf838ffda09cebbc9b25fe12f8b8a5e1b32391561e7c153" +checksum = "654b8f14bf076fe5995fe94fabbe41a98041e1f2f801e5b3404dcae87e476db6" dependencies = [ "basic-toml", "lazy_static", @@ -299,9 +312,9 @@ dependencies = [ [[package]] name = "esp32c3" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c22d8c27e7d675ef79db212b9e41df80aef6db1a5c819e4e726735f64ee0700" +checksum = "f117ffaf6cb5873e8ba4f78b969491fac3db459c08bf464af1e3b3fc5394692d" dependencies = [ "critical-section", "vcell", @@ -394,9 +407,9 @@ checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "portable-atomic" @@ -439,9 +452,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -525,22 +538,22 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -551,9 +564,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -593,7 +606,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -609,9 +622,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -730,5 +743,5 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] diff --git a/intro/button/Cargo.toml b/intro/button/Cargo.toml index 728f4af..1d65ecc 100644 --- a/intro/button/Cargo.toml +++ b/intro/button/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -esp-hal = { version = "0.17.0", features = ["esp32c3"] } -esp-backtrace = { version = "0.11.1", features = [ +esp-hal = { version = "0.18.0", features = ["esp32c3"] } +esp-backtrace = { version = "0.12.0", features = [ "esp32c3", "panic-handler", "exception-handler", diff --git a/intro/button/examples/button.rs b/intro/button/examples/button.rs index f643a0e..e1a5222 100644 --- a/intro/button/examples/button.rs +++ b/intro/button/examples/button.rs @@ -2,20 +2,25 @@ #![no_main] use esp_backtrace as _; -use esp_hal::{gpio::IO, peripherals::Peripherals, prelude::*}; +use esp_hal::{ + gpio::{Input, Io, Level, Output, Pull}, + peripherals::Peripherals, + prelude::*, + system::SystemControl, +}; use esp_println::println; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let _system = SystemControl::new(peripherals.SYSTEM); println!("Hello world!"); // Set GPIO7 as an output, and set its state high initially. - let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); - let mut led = io.pins.gpio7.into_push_pull_output(); - let button = io.pins.gpio9.into_pull_up_input(); + let io = Io::new(peripherals.GPIO, peripherals.IO_MUX); + let mut led = Output::new(io.pins.gpio7, Level::Low); + let button = Input::new(io.pins.gpio9, Pull::Up); // Check the button state and set the LED state accordingly. loop { diff --git a/intro/button/src/main.rs b/intro/button/src/main.rs index fd7eac7..941fc33 100644 --- a/intro/button/src/main.rs +++ b/intro/button/src/main.rs @@ -2,13 +2,18 @@ #![no_main] use esp_backtrace as _; -use esp_hal::{gpio::IO, peripherals::Peripherals, prelude::*}; +use esp_hal::{ + gpio::{Input, Io, Level, Output, Pull}, + peripherals::Peripherals, + prelude::*, + system::SystemControl, +}; use esp_println::println; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let _system = SystemControl::new(peripherals.SYSTEM); println!("Hello world!"); diff --git a/intro/defmt/Cargo.lock b/intro/defmt/Cargo.lock index 814d077..77a3118 100644 --- a/intro/defmt/Cargo.lock +++ b/intro/defmt/Cargo.lock @@ -77,9 +77,9 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -87,34 +87,34 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "defmt" version = "0.1.0" dependencies = [ - "defmt 0.3.6", + "defmt 0.3.8", "esp-backtrace", "esp-hal", "esp-println", @@ -122,9 +122,9 @@ dependencies = [ [[package]] name = "defmt" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3939552907426de152b3c2c6f51ed53f98f448babd26f28694c95f5906194595" +checksum = "a99dd22262668b887121d4672af5a64b238f026099f1a2a1b322066c9ecfe9e0" dependencies = [ "bitflags 1.3.2", "defmt-macros", @@ -140,7 +140,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -152,6 +152,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "delegate" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "document-features" version = "0.2.8" @@ -225,7 +236,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -236,11 +247,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "esp-backtrace" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda6c53c50ed96cce44e8565bd7659f8884d55bac3262184c3a77f748553e3ff" +checksum = "613da39ca9dde7a2360ff1a273da78d9ff97e82ea095b520fb6b5dabf7192c6f" dependencies = [ - "defmt 0.3.6", + "defmt 0.3.8", + "esp-build", "esp-println", ] @@ -251,21 +263,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b94a4b8d74e7cc7baabcca5b2277b41877e039ad9cd49959d48ef94dac7eab4b" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.66", "termcolor", ] [[package]] name = "esp-hal" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e19440eb58fd1dd0c4f6722c953f7026571210c70ce69956d022faeb8fe4b4" +checksum = "44f1bf3b1b34bbeb59e24e630f26e21b95f9c2bb7c0a53361ae5a97c67936566" dependencies = [ "basic-toml", "bitfield", "bitflags 2.5.0", "cfg-if", "critical-section", + "delegate", "document-features", "embedded-can", "embedded-dma", @@ -291,9 +304,9 @@ dependencies = [ [[package]] name = "esp-hal-procmacros" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a9e9df075eb0c1e0a4349a4317c86b01be2acabe6f69d935c9c71d8a99e56a" +checksum = "788b535b8127a8f0d1f40a8d8e300e57a8c361c492d660dd08fe8e9a1b96ee3c" dependencies = [ "darling", "document-features", @@ -302,14 +315,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "esp-metadata" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a97109e81e9fb68cbf838ffda09cebbc9b25fe12f8b8a5e1b32391561e7c153" +checksum = "654b8f14bf076fe5995fe94fabbe41a98041e1f2f801e5b3404dcae87e476db6" dependencies = [ "basic-toml", "lazy_static", @@ -324,7 +337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e98f0f58453dd2ce08d99228fc8757fad39d05dfd26643665d1093b8844f42cc" dependencies = [ "critical-section", - "defmt 0.3.6", + "defmt 0.3.8", "log", ] @@ -341,9 +354,9 @@ dependencies = [ [[package]] name = "esp32c3" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c22d8c27e7d675ef79db212b9e41df80aef6db1a5c819e4e726735f64ee0700" +checksum = "f117ffaf6cb5873e8ba4f78b969491fac3db459c08bf464af1e3b3fc5394692d" dependencies = [ "critical-section", "vcell", @@ -442,9 +455,9 @@ checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "portable-atomic" @@ -487,9 +500,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -573,22 +586,22 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -599,9 +612,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -641,7 +654,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -657,9 +670,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -692,7 +705,7 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -798,5 +811,5 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] diff --git a/intro/defmt/Cargo.toml b/intro/defmt/Cargo.toml index defe501..76c54ca 100644 --- a/intro/defmt/Cargo.toml +++ b/intro/defmt/Cargo.toml @@ -6,12 +6,11 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -esp-hal = { version = "0.17.0", features = ["esp32c3"] } -esp-backtrace = { version = "0.11.1", features = [ +esp-hal = { version = "0.18.0", features = ["esp32c3"] } +esp-backtrace = { version = "0.12.0", features = [ "esp32c3", "panic-handler", "exception-handler", - "println", "defmt", ] } esp-println = { version = "0.9.1", features = [ @@ -20,4 +19,4 @@ esp-println = { version = "0.9.1", features = [ "log", "defmt-espflash", ] } -defmt = "0.3.6" +defmt = "0.3.8" diff --git a/intro/defmt/examples/defmt.rs b/intro/defmt/examples/defmt.rs index 02c5914..82e31b2 100644 --- a/intro/defmt/examples/defmt.rs +++ b/intro/defmt/examples/defmt.rs @@ -5,12 +5,14 @@ use esp_backtrace as _; use esp_println as _; // ANCHOR_END: println_include -use esp_hal::{clock::ClockControl, delay::Delay, peripherals::Peripherals, prelude::*}; +use esp_hal::{ + clock::ClockControl, delay::Delay, peripherals::Peripherals, prelude::*, system::SystemControl, +}; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); let clocks = ClockControl::max(system.clock_control).freeze(); let delay = Delay::new(&clocks); diff --git a/intro/defmt/src/main.rs b/intro/defmt/src/main.rs index 60146dd..b64c1d7 100644 --- a/intro/defmt/src/main.rs +++ b/intro/defmt/src/main.rs @@ -3,12 +3,14 @@ // Build the `esp_println` and `esp_backtrace` libs -use esp_hal::{clock::ClockControl, delay::Delay, peripherals::Peripherals, prelude::*}; +use esp_hal::{ + clock::ClockControl, delay::Delay, peripherals::Peripherals, prelude::*, system::SystemControl, +}; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); let clocks = ClockControl::max(system.clock_control).freeze(); let delay = Delay::new(&clocks); diff --git a/intro/dma/Cargo.lock b/intro/dma/Cargo.lock index 4c4c2dc..2a1bca2 100644 --- a/intro/dma/Cargo.lock +++ b/intro/dma/Cargo.lock @@ -71,9 +71,9 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -81,27 +81,38 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.66", +] + +[[package]] +name = "delegate" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -186,7 +197,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -197,10 +208,11 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "esp-backtrace" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda6c53c50ed96cce44e8565bd7659f8884d55bac3262184c3a77f748553e3ff" +checksum = "613da39ca9dde7a2360ff1a273da78d9ff97e82ea095b520fb6b5dabf7192c6f" dependencies = [ + "esp-build", "esp-println", ] @@ -211,21 +223,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b94a4b8d74e7cc7baabcca5b2277b41877e039ad9cd49959d48ef94dac7eab4b" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.66", "termcolor", ] [[package]] name = "esp-hal" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e19440eb58fd1dd0c4f6722c953f7026571210c70ce69956d022faeb8fe4b4" +checksum = "44f1bf3b1b34bbeb59e24e630f26e21b95f9c2bb7c0a53361ae5a97c67936566" dependencies = [ "basic-toml", "bitfield", "bitflags", "cfg-if", "critical-section", + "delegate", "document-features", "embedded-can", "embedded-dma", @@ -251,9 +264,9 @@ dependencies = [ [[package]] name = "esp-hal-procmacros" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a9e9df075eb0c1e0a4349a4317c86b01be2acabe6f69d935c9c71d8a99e56a" +checksum = "788b535b8127a8f0d1f40a8d8e300e57a8c361c492d660dd08fe8e9a1b96ee3c" dependencies = [ "darling", "document-features", @@ -262,14 +275,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "esp-metadata" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a97109e81e9fb68cbf838ffda09cebbc9b25fe12f8b8a5e1b32391561e7c153" +checksum = "654b8f14bf076fe5995fe94fabbe41a98041e1f2f801e5b3404dcae87e476db6" dependencies = [ "basic-toml", "lazy_static", @@ -299,9 +312,9 @@ dependencies = [ [[package]] name = "esp32c3" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c22d8c27e7d675ef79db212b9e41df80aef6db1a5c819e4e726735f64ee0700" +checksum = "f117ffaf6cb5873e8ba4f78b969491fac3db459c08bf464af1e3b3fc5394692d" dependencies = [ "critical-section", "vcell", @@ -394,9 +407,9 @@ checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "portable-atomic" @@ -439,9 +452,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -525,22 +538,22 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -551,9 +564,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -593,7 +606,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -609,9 +622,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -730,5 +743,5 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] diff --git a/intro/dma/Cargo.toml b/intro/dma/Cargo.toml index a373fb7..a162c52 100644 --- a/intro/dma/Cargo.toml +++ b/intro/dma/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -esp-hal = { version = "0.17.0", features = ["esp32c3"] } -esp-backtrace = { version = "0.11.1", features = [ +esp-hal = { version = "0.18.0", features = ["esp32c3"] } +esp-backtrace = { version = "0.12.0", features = [ "esp32c3", "panic-handler", "exception-handler", diff --git a/intro/dma/examples/dma.rs b/intro/dma/examples/dma.rs index 9839647..d069b1d 100644 --- a/intro/dma/examples/dma.rs +++ b/intro/dma/examples/dma.rs @@ -11,23 +11,24 @@ use esp_hal::{ dma::Dma, dma::DmaPriority, dma_buffers, - gpio::IO, + gpio::Io, peripherals::Peripherals, prelude::*, spi::{ master::{prelude::*, Spi}, SpiMode, }, + system::SystemControl, }; use esp_println::{print, println}; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); - let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); + let io = Io::new(peripherals.GPIO, peripherals.IO_MUX); let sclk = io.pins.gpio0; let miso = io.pins.gpio2; let mosi = io.pins.gpio4; @@ -63,7 +64,7 @@ fn main() -> ! { // ANCHOR: transfer // `dma_transfer` will move the driver and the buffers into the // returned transfer. - let transfer = spi.dma_transfer(&mut tx_buffer, &mut rx_buffer).unwrap(); + let mut transfer = spi.dma_transfer(&mut tx_buffer, &mut rx_buffer).unwrap(); // ANCHOR_END: transfer // here the CPU could do other things while the transfer is taking done without using the CPU diff --git a/intro/dma/src/main.rs b/intro/dma/src/main.rs index f02d016..9f79d32 100644 --- a/intro/dma/src/main.rs +++ b/intro/dma/src/main.rs @@ -11,23 +11,24 @@ use esp_hal::{ dma::Dma, dma::DmaPriority, dma_buffers, - gpio::IO, + gpio::Io, peripherals::Peripherals, prelude::*, spi::{ master::{prelude::*, Spi}, SpiMode, }, + system::SystemControl, }; use esp_println::{print, println}; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); let clocks = ClockControl::boot_defaults(system.clock_control).freeze(); - let io = IO::new(peripherals.GPIO, peripherals.IO_MUX); + let io = Io::new(peripherals.GPIO, peripherals.IO_MUX); let sclk = io.pins.gpio0; let miso = io.pins.gpio2; let mosi = io.pins.gpio4; diff --git a/intro/hello-world/Cargo.lock b/intro/hello-world/Cargo.lock index 564a805..1a76197 100644 --- a/intro/hello-world/Cargo.lock +++ b/intro/hello-world/Cargo.lock @@ -71,9 +71,9 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -81,27 +81,38 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.66", +] + +[[package]] +name = "delegate" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -177,7 +188,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -188,10 +199,11 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "esp-backtrace" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda6c53c50ed96cce44e8565bd7659f8884d55bac3262184c3a77f748553e3ff" +checksum = "613da39ca9dde7a2360ff1a273da78d9ff97e82ea095b520fb6b5dabf7192c6f" dependencies = [ + "esp-build", "esp-println", ] @@ -202,21 +214,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b94a4b8d74e7cc7baabcca5b2277b41877e039ad9cd49959d48ef94dac7eab4b" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.66", "termcolor", ] [[package]] name = "esp-hal" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e19440eb58fd1dd0c4f6722c953f7026571210c70ce69956d022faeb8fe4b4" +checksum = "44f1bf3b1b34bbeb59e24e630f26e21b95f9c2bb7c0a53361ae5a97c67936566" dependencies = [ "basic-toml", "bitfield", "bitflags", "cfg-if", "critical-section", + "delegate", "document-features", "embedded-can", "embedded-dma", @@ -242,9 +255,9 @@ dependencies = [ [[package]] name = "esp-hal-procmacros" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a9e9df075eb0c1e0a4349a4317c86b01be2acabe6f69d935c9c71d8a99e56a" +checksum = "788b535b8127a8f0d1f40a8d8e300e57a8c361c492d660dd08fe8e9a1b96ee3c" dependencies = [ "darling", "document-features", @@ -253,14 +266,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "esp-metadata" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a97109e81e9fb68cbf838ffda09cebbc9b25fe12f8b8a5e1b32391561e7c153" +checksum = "654b8f14bf076fe5995fe94fabbe41a98041e1f2f801e5b3404dcae87e476db6" dependencies = [ "basic-toml", "lazy_static", @@ -290,9 +303,9 @@ dependencies = [ [[package]] name = "esp32c3" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c22d8c27e7d675ef79db212b9e41df80aef6db1a5c819e4e726735f64ee0700" +checksum = "f117ffaf6cb5873e8ba4f78b969491fac3db459c08bf464af1e3b3fc5394692d" dependencies = [ "critical-section", "vcell", @@ -394,9 +407,9 @@ checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "portable-atomic" @@ -439,9 +452,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -525,22 +538,22 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -551,9 +564,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -593,7 +606,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -609,9 +622,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -730,5 +743,5 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] diff --git a/intro/hello-world/Cargo.toml b/intro/hello-world/Cargo.toml index 530dbe0..5e0629a 100644 --- a/intro/hello-world/Cargo.toml +++ b/intro/hello-world/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -esp-hal = { version = "0.17.0", features = ["esp32c3"] } -esp-backtrace = { version = "0.11.1", features = [ +esp-hal = { version = "0.18.0", features = ["esp32c3"] } +esp-backtrace = { version = "0.12.0", features = [ "esp32c3", "panic-handler", "exception-handler", diff --git a/intro/hello-world/src/main.rs b/intro/hello-world/src/main.rs index 255a943..d35eeff 100644 --- a/intro/hello-world/src/main.rs +++ b/intro/hello-world/src/main.rs @@ -2,13 +2,13 @@ #![no_main] use esp_backtrace as _; +use esp_hal::{peripherals::Peripherals, prelude::*, system::SystemControl}; use esp_println::println; -use esp_hal::{peripherals::Peripherals, prelude::*}; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let _system = peripherals.SYSTEM.split(); + let _system = SystemControl::new(peripherals.SYSTEM); println!("Hello world!"); diff --git a/intro/http-client/Cargo.lock b/intro/http-client/Cargo.lock index 10ee868..ef0d8c3 100644 --- a/intro/http-client/Cargo.lock +++ b/intro/http-client/Cargo.lock @@ -98,9 +98,9 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -108,27 +108,38 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.66", +] + +[[package]] +name = "delegate" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -140,13 +151,45 @@ dependencies = [ "litrs", ] +[[package]] +name = "embassy-executor" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec648daedd2143466eff4b3e8002024f9f6c1de4ab7666bb679688752624c925" +dependencies = [ + "critical-section", + "document-features", + "embassy-executor-macros", +] + +[[package]] +name = "embassy-executor-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad454accf80050e9cf7a51e994132ba0e56286b31f9317b68703897c328c59b5" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "embassy-time-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c214077aaa9206958b16411c157961fb7990d4ea628120a78d1a5a28aed24" +dependencies = [ + "document-features", +] + [[package]] name = "embedded-can" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9d2e857f87ac832df68fa498d18ddc679175cf3d2e4aa893988e5601baf9438" dependencies = [ - "nb 1.1.0", + "nb", ] [[package]] @@ -158,16 +201,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "embedded-hal" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff" -dependencies = [ - "nb 0.1.3", - "void", -] - [[package]] name = "embedded-hal" version = "1.0.0" @@ -180,8 +213,8 @@ 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", + "embedded-hal", + "nb", ] [[package]] @@ -220,7 +253,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -231,10 +264,11 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "esp-backtrace" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda6c53c50ed96cce44e8565bd7659f8884d55bac3262184c3a77f748553e3ff" +checksum = "613da39ca9dde7a2360ff1a273da78d9ff97e82ea095b520fb6b5dabf7192c6f" dependencies = [ + "esp-build", "esp-println", ] @@ -245,25 +279,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b94a4b8d74e7cc7baabcca5b2277b41877e039ad9cd49959d48ef94dac7eab4b" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.66", "termcolor", ] [[package]] name = "esp-hal" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e19440eb58fd1dd0c4f6722c953f7026571210c70ce69956d022faeb8fe4b4" +checksum = "44f1bf3b1b34bbeb59e24e630f26e21b95f9c2bb7c0a53361ae5a97c67936566" dependencies = [ "basic-toml", "bitfield", "bitflags 2.5.0", "cfg-if", "critical-section", + "delegate", "document-features", "embedded-can", "embedded-dma", - "embedded-hal 1.0.0", + "embedded-hal", "embedded-hal-nb", "enumset", "esp-build", @@ -273,7 +308,7 @@ dependencies = [ "esp32c3", "fugit", "log", - "nb 1.1.0", + "nb", "paste", "portable-atomic", "rand_core", @@ -284,11 +319,28 @@ dependencies = [ "xtensa-lx-rt", ] +[[package]] +name = "esp-hal-embassy" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a892b9fe96cdfddab252ffa0ea90de66ccb078ff42d037b14ca9dfa3608b688a" +dependencies = [ + "cfg-if", + "critical-section", + "document-features", + "embassy-executor", + "embassy-time-driver", + "esp-build", + "esp-hal", + "esp-metadata", + "portable-atomic", +] + [[package]] name = "esp-hal-procmacros" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a9e9df075eb0c1e0a4349a4317c86b01be2acabe6f69d935c9c71d8a99e56a" +checksum = "788b535b8127a8f0d1f40a8d8e300e57a8c361c492d660dd08fe8e9a1b96ee3c" dependencies = [ "darling", "document-features", @@ -297,14 +349,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "esp-metadata" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a97109e81e9fb68cbf838ffda09cebbc9b25fe12f8b8a5e1b32391561e7c153" +checksum = "654b8f14bf076fe5995fe94fabbe41a98041e1f2f801e5b3404dcae87e476db6" dependencies = [ "basic-toml", "lazy_static", @@ -334,17 +386,18 @@ dependencies = [ [[package]] name = "esp-wifi" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067727b040ded02ecb1ba9ee9ae1aaa8d12493c9faecbadd5a3d170655ce485" +checksum = "48709a955a7730ef27457682d4f3173d956ae7cd4182c46252a61bd2f61ace6c" dependencies = [ "atomic-waker", "cfg-if", "critical-section", - "embedded-hal 0.2.7", "embedded-io", "enumset", + "esp-build", "esp-hal", + "esp-hal-embassy", "esp-wifi-sys", "fugit", "futures-util", @@ -372,9 +425,9 @@ dependencies = [ [[package]] name = "esp32c3" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c22d8c27e7d675ef79db212b9e41df80aef6db1a5c819e4e726735f64ee0700" +checksum = "f117ffaf6cb5873e8ba4f78b969491fac3db459c08bf464af1e3b3fc5394692d" dependencies = [ "critical-section", "vcell", @@ -543,15 +596,6 @@ dependencies = [ "serde", ] -[[package]] -name = "nb" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" -dependencies = [ - "nb 1.1.0", -] - [[package]] name = "nb" version = "1.1.0" @@ -572,23 +616,23 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pin-project-lite" @@ -626,7 +670,7 @@ checksum = "a33fa6ec7f2047f572d49317cca19c87195de99c6e5b6ee492da701cfe02b053" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -664,9 +708,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -728,7 +772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f5c1b8bf41ea746266cdee443d1d1e9125c86ce1447e1a2615abd34330d33a9" dependencies = [ "critical-section", - "embedded-hal 1.0.0", + "embedded-hal", ] [[package]] @@ -750,22 +794,22 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -798,9 +842,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -840,7 +884,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -856,9 +900,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -896,7 +940,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.60", + "syn 2.0.66", "toml", ] @@ -1028,5 +1072,5 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] diff --git a/intro/http-client/Cargo.toml b/intro/http-client/Cargo.toml index ad870ec..6cc27d5 100644 --- a/intro/http-client/Cargo.toml +++ b/intro/http-client/Cargo.toml @@ -16,15 +16,15 @@ opt-level = 3 lto = "off" [dependencies] -esp-hal = { version = "0.17.0", features = ["esp32c3"] } -esp-backtrace = { version = "0.11.1", features = [ +esp-hal = { version = "0.18.0", features = ["esp32c3"] } +esp-backtrace = { version = "0.12.0", features = [ "esp32c3", "panic-handler", "exception-handler", "println", ] } esp-println = { version = "0.9.1", features = ["esp32c3", "uart"] } -esp-wifi = { version = "0.5.0", features = [ +esp-wifi = { version = "0.6.0", features = [ "esp32c3", "wifi-default", "utils", diff --git a/intro/http-client/examples/http-client.rs b/intro/http-client/examples/http-client.rs index 8552b68..0603779 100644 --- a/intro/http-client/examples/http-client.rs +++ b/intro/http-client/examples/http-client.rs @@ -2,7 +2,8 @@ #![no_main] use esp_hal::{ - clock::ClockControl, peripherals::Peripherals, prelude::*, rng::Rng, systimer::SystemTimer, + clock::ClockControl, peripherals::Peripherals, prelude::*, rng::Rng, system::SystemControl, + timer::systimer::SystemTimer, }; use embedded_io::*; @@ -24,7 +25,7 @@ const PASSWORD: &str = env!("PASSWORD"); #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); // Set clocks at maximum frequency let clocks = ClockControl::max(system.clock_control).freeze(); @@ -35,7 +36,7 @@ fn main() -> ! { EspWifiInitFor::Wifi, timer, Rng::new(peripherals.RNG), - system.radio_clock_control, + peripherals.RADIO_CLK, &clocks, ) .unwrap(); diff --git a/intro/http-client/src/main.rs b/intro/http-client/src/main.rs index 9ef91ad..4135d8b 100644 --- a/intro/http-client/src/main.rs +++ b/intro/http-client/src/main.rs @@ -2,7 +2,8 @@ #![no_main] use esp_hal::{ - clock::ClockControl, peripherals::Peripherals, prelude::*, rng::Rng, systimer::SystemTimer, + clock::ClockControl, peripherals::Peripherals, prelude::*, rng::Rng, system::SystemControl, + timer::systimer::SystemTimer, }; use embedded_io::*; @@ -24,7 +25,7 @@ const PASSWORD: &str = env!("PASSWORD"); #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let mut system = peripherals.SYSTEM.split(); + let system = SystemControl::new(peripherals.SYSTEM); // Set clocks at maximum frequency // let clocks = diff --git a/intro/panic/Cargo.lock b/intro/panic/Cargo.lock index d41538c..0ea4259 100644 --- a/intro/panic/Cargo.lock +++ b/intro/panic/Cargo.lock @@ -71,9 +71,9 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -81,27 +81,38 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.66", +] + +[[package]] +name = "delegate" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -177,7 +188,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -188,10 +199,11 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "esp-backtrace" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda6c53c50ed96cce44e8565bd7659f8884d55bac3262184c3a77f748553e3ff" +checksum = "613da39ca9dde7a2360ff1a273da78d9ff97e82ea095b520fb6b5dabf7192c6f" dependencies = [ + "esp-build", "esp-println", ] @@ -202,21 +214,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b94a4b8d74e7cc7baabcca5b2277b41877e039ad9cd49959d48ef94dac7eab4b" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.66", "termcolor", ] [[package]] name = "esp-hal" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e19440eb58fd1dd0c4f6722c953f7026571210c70ce69956d022faeb8fe4b4" +checksum = "44f1bf3b1b34bbeb59e24e630f26e21b95f9c2bb7c0a53361ae5a97c67936566" dependencies = [ "basic-toml", "bitfield", "bitflags", "cfg-if", "critical-section", + "delegate", "document-features", "embedded-can", "embedded-dma", @@ -242,9 +255,9 @@ dependencies = [ [[package]] name = "esp-hal-procmacros" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a9e9df075eb0c1e0a4349a4317c86b01be2acabe6f69d935c9c71d8a99e56a" +checksum = "788b535b8127a8f0d1f40a8d8e300e57a8c361c492d660dd08fe8e9a1b96ee3c" dependencies = [ "darling", "document-features", @@ -253,14 +266,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "esp-metadata" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a97109e81e9fb68cbf838ffda09cebbc9b25fe12f8b8a5e1b32391561e7c153" +checksum = "654b8f14bf076fe5995fe94fabbe41a98041e1f2f801e5b3404dcae87e476db6" dependencies = [ "basic-toml", "lazy_static", @@ -290,9 +303,9 @@ dependencies = [ [[package]] name = "esp32c3" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c22d8c27e7d675ef79db212b9e41df80aef6db1a5c819e4e726735f64ee0700" +checksum = "f117ffaf6cb5873e8ba4f78b969491fac3db459c08bf464af1e3b3fc5394692d" dependencies = [ "critical-section", "vcell", @@ -394,9 +407,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "portable-atomic" @@ -439,9 +452,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -525,22 +538,22 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -551,9 +564,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -593,7 +606,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -609,9 +622,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -730,5 +743,5 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] diff --git a/intro/panic/Cargo.toml b/intro/panic/Cargo.toml index ed0c9fd..42f3fa9 100644 --- a/intro/panic/Cargo.toml +++ b/intro/panic/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -esp-hal = { version = "0.17.0", features = ["esp32c3"] } -esp-backtrace = { version = "0.11.1", features = [ +esp-hal = { version = "0.18.0", features = ["esp32c3"] } +esp-backtrace = { version = "0.12.0", features = [ "esp32c3", "panic-handler", "exception-handler", diff --git a/intro/panic/examples/panic.rs b/intro/panic/examples/panic.rs index 3a33d01..7e4eed1 100644 --- a/intro/panic/examples/panic.rs +++ b/intro/panic/examples/panic.rs @@ -2,13 +2,13 @@ #![no_main] use esp_backtrace as _; +use esp_hal::{peripherals::Peripherals, prelude::*, system::SystemControl}; use esp_println::println; -use esp_hal::{peripherals::Peripherals, prelude::*}; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let _system = peripherals.SYSTEM.split(); + let _system = SystemControl::new(peripherals.SYSTEM); println!("Hello world!"); diff --git a/intro/panic/src/main.rs b/intro/panic/src/main.rs index 255a943..d35eeff 100644 --- a/intro/panic/src/main.rs +++ b/intro/panic/src/main.rs @@ -2,13 +2,13 @@ #![no_main] use esp_backtrace as _; +use esp_hal::{peripherals::Peripherals, prelude::*, system::SystemControl}; use esp_println::println; -use esp_hal::{peripherals::Peripherals, prelude::*}; #[entry] fn main() -> ! { let peripherals = Peripherals::take(); - let _system = peripherals.SYSTEM.split(); + let _system = SystemControl::new(peripherals.SYSTEM); println!("Hello world!");