Skip to content

Commit

Permalink
Merge pull request #46 from SergioGasquez/feat/update-deps
Browse files Browse the repository at this point in the history
Update training to esp-hal 0.18.0
  • Loading branch information
bjoernQ authored Jun 5, 2024
2 parents 34a7455 + 059d3cb commit 943359a
Show file tree
Hide file tree
Showing 37 changed files with 619 additions and 438 deletions.
85 changes: 49 additions & 36 deletions advanced/stack-overflow-detection/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions advanced/stack-overflow-detection/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion advanced/stack-overflow-detection/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion book/src/03_2_blinky.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion book/src/03_3_button.md
Original file line number Diff line number Diff line change
Expand Up @@ -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].

Expand Down
Loading

0 comments on commit 943359a

Please sign in to comment.