Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion book/en/src/by-example/app_init.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ signature `fn(init::Context) -> (Shared, Local)`, where `Shared` and `Local` are

The `init` task executes after system reset, [after an optionally defined `pre-init` code section][^pre-init] and an always occurring internal RTIC initialization.

The `init` and optional `pre-init` tasks runs _with interrupts disabled_ and have exclusive access to Cortex-M (the `bare_metal::CriticalSection` token is available as `cs`).
The `init` and optional `pre-init` tasks runs _with interrupts disabled_ and have exclusive access to Cortex-M (the `critical_section::CriticalSection` token is available as `cs`).

Device specific peripherals are available through the `core` and `device` fields of `init::Context`.

Expand Down
24 changes: 13 additions & 11 deletions examples/lm3s6965/Cargo.lock

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

1 change: 0 additions & 1 deletion examples/lm3s6965/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ edition = "2021"
heapless = "0.8"
lm3s6965 = "0.2"
cortex-m = "0.7.0"
bare-metal = "1.0.0"
cortex-m-semihosting = "0.5.0"
rtic-time = { path = "../../rtic-time" }
rtic-sync = { path = "../../rtic-sync" }
Expand Down
2 changes: 1 addition & 1 deletion examples/lm3s6965/examples/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ mod app {

// Access to the critical section token,
// to indicate that this is a critical section
let _cs_token: bare_metal::CriticalSection = cx.cs;
let _cs_token: rtic::export::CriticalSection = cx.cs;

hprintln!("init");

Expand Down
1 change: 1 addition & 0 deletions rtic/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Example:

### Changed

- Removed `bare_metal` in favour of `critical_section`.
- Updated esp32c3 dependency to v0.30.0
- Updated esp32c6 dependency to v0.21.0

Expand Down
1 change: 0 additions & 1 deletion rtic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ esp32c3 = { version = "0.30.0", optional = true }
esp32c6 = { version = "0.21.0", optional = true }
riscv = { version = "0.15.0", optional = true }
cortex-m = { version = "0.7.0", optional = true }
bare-metal = "1.0.0"
portable-atomic = { version = "1", default-features = false }
rtic-macros = { path = "../rtic-macros", version = "=2.2.0" }
rtic-core = "1"
Expand Down
2 changes: 1 addition & 1 deletion rtic/src/export.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pub use bare_metal::CriticalSection;
pub use critical_section::CriticalSection;
pub use portable_atomic as atomic;

pub mod executor;
Expand Down
Loading