aboutsummaryrefslogtreecommitdiff
path: root/examples/complex.rs
diff options
context:
space:
mode:
Diffstat (limited to 'examples/complex.rs')
-rw-r--r--examples/complex.rs53
1 files changed, 25 insertions, 28 deletions
diff --git a/examples/complex.rs b/examples/complex.rs
index e5cf6dbe..2be71d22 100644
--- a/examples/complex.rs
+++ b/examples/complex.rs
@@ -25,7 +25,7 @@ mod app {
#[init]
fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {
- hprintln!("init").unwrap();
+ hprintln!("init");
(
Shared {
@@ -40,31 +40,31 @@ mod app {
#[idle(shared = [s2, s3])]
fn idle(mut cx: idle::Context) -> ! {
- hprintln!("idle p0 started").ok();
+ hprintln!("idle p0 started");
rtic::pend(Interrupt::GPIOC);
cx.shared.s3.lock(|s| {
- hprintln!("idle enter lock s3 {}", s).ok();
- hprintln!("idle pend t0").ok();
+ hprintln!("idle enter lock s3 {}", s);
+ hprintln!("idle pend t0");
rtic::pend(Interrupt::GPIOA); // t0 p2, with shared ceiling 3
- hprintln!("idle pend t1").ok();
+ hprintln!("idle pend t1");
rtic::pend(Interrupt::GPIOB); // t1 p3, with shared ceiling 3
- hprintln!("idle pend t2").ok();
+ hprintln!("idle pend t2");
rtic::pend(Interrupt::GPIOC); // t2 p4, no sharing
- hprintln!("idle still in lock s3 {}", s).ok();
+ hprintln!("idle still in lock s3 {}", s);
});
- hprintln!("\nback in idle").ok();
+ hprintln!("\nback in idle");
cx.shared.s2.lock(|s| {
- hprintln!("enter lock s2 {}", s).ok();
- hprintln!("idle pend t0").ok();
+ hprintln!("enter lock s2 {}", s);
+ hprintln!("idle pend t0");
rtic::pend(Interrupt::GPIOA); // t0 p2, with shared ceiling 2
- hprintln!("idle pend t1").ok();
+ hprintln!("idle pend t1");
rtic::pend(Interrupt::GPIOB); // t1 p3, no sharing
- hprintln!("idle pend t2").ok();
+ hprintln!("idle pend t2");
rtic::pend(Interrupt::GPIOC); // t2 p4, no sharing
- hprintln!("idle still in lock s2 {}", s).ok();
+ hprintln!("idle still in lock s2 {}", s);
});
- hprintln!("\nidle exit").ok();
+ hprintln!("\nidle exit");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
@@ -82,9 +82,8 @@ mod app {
"t0 p2 called {} time{}",
*cx.local.times,
if *cx.local.times > 1 { "s" } else { "" }
- )
- .ok();
- hprintln!("t0 p2 exit").ok();
+ );
+ hprintln!("t0 p2 exit");
}
#[task(binds = GPIOB, priority = 3, local = [times: u32 = 0], shared = [s3, s4])]
@@ -96,19 +95,18 @@ mod app {
"t1 p3 called {} time{}",
*cx.local.times,
if *cx.local.times > 1 { "s" } else { "" }
- )
- .ok();
+ );
cx.shared.s4.lock(|s| {
- hprintln!("t1 enter lock s4 {}", s).ok();
- hprintln!("t1 pend t0").ok();
+ hprintln!("t1 enter lock s4 {}", s);
+ hprintln!("t1 pend t0");
rtic::pend(Interrupt::GPIOA); // t0 p2, with shared ceiling 2
- hprintln!("t1 pend t2").ok();
+ hprintln!("t1 pend t2");
rtic::pend(Interrupt::GPIOC); // t2 p4, no sharing
- hprintln!("t1 still in lock s4 {}", s).ok();
+ hprintln!("t1 still in lock s4 {}", s);
});
- hprintln!("t1 p3 exit").ok();
+ hprintln!("t1 p3 exit");
}
#[task(binds = GPIOC, priority = 4, local = [times: u32 = 0], shared = [s4])]
@@ -120,13 +118,12 @@ mod app {
"t2 p4 called {} time{}",
*cx.local.times,
if *cx.local.times > 1 { "s" } else { "" }
- )
- .unwrap();
+ );
cx.shared.s4.lock(|s| {
- hprintln!("enter lock s4 {}", s).ok();
+ hprintln!("enter lock s4 {}", s);
*s += 1;
});
- hprintln!("t3 p4 exit").ok();
+ hprintln!("t3 p4 exit");
}
}