From d079949139b9d4d5280a08143edc1d717d5c5b52 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Sat, 14 Nov 2020 16:09:20 +0100 Subject: [PATCH] Add multilock to the book --- book/en/src/by-example/resources.md | 8 ++++++++ src/lib.rs | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/book/en/src/by-example/resources.md b/book/en/src/by-example/resources.md index 301961d009..3a3e0b7660 100644 --- a/book/en/src/by-example/resources.md +++ b/book/en/src/by-example/resources.md @@ -64,6 +64,14 @@ $ cargo run --example lock {{#include ../../../../ci/expected/lock.run}} ``` +## Multi-lock + +As an extension to `lock`, and to reduce rightward drift, locks can be taken as tuples. The following examples shows this in use: + +``` rust +{{#include ../../../../examples/multilock.rs}} +``` + ## Late resources Late resources are resources that are not given an initial value at compile time using the `#[init]` attribute but instead are initialized at runtime using the `init::LateResources` values returned by the `init` function. diff --git a/src/lib.rs b/src/lib.rs index fc1991c659..9c2b252d45 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -43,7 +43,7 @@ use cortex_m::{ }; use cortex_m_rt as _; // vector table pub use cortex_m_rtic_macros::app; -pub use rtic_core::{Exclusive, Mutex, prelude as mutex_prelude}; +pub use rtic_core::{prelude as mutex_prelude, Exclusive, Mutex}; #[cfg(armv7m)] pub mod cyccnt;