aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/baseline.rs18
-rw-r--r--examples/capacity.rs18
-rw-r--r--examples/generics.rs62
-rw-r--r--examples/idle.rs16
-rw-r--r--examples/init.rs16
-rw-r--r--examples/interrupt.rs21
-rw-r--r--examples/late.rs14
-rw-r--r--examples/lock.rs22
-rw-r--r--examples/message.rs18
-rw-r--r--examples/periodic.rs13
-rw-r--r--examples/ramfunc.rs14
-rw-r--r--examples/resource.rs16
-rw-r--r--examples/schedule.rs17
-rw-r--r--examples/singleton.rs16
-rw-r--r--examples/static.rs16
-rw-r--r--examples/task.rs18
-rw-r--r--examples/types.rs3
17 files changed, 116 insertions, 202 deletions
diff --git a/examples/baseline.rs b/examples/baseline.rs
index 73ef4c9..fdf3683 100644
--- a/examples/baseline.rs
+++ b/examples/baseline.rs
@@ -7,26 +7,16 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
// NOTE: does NOT properly work on QEMU
#[app(device = lm3s6965)]
const APP: () = {
#[init(spawn = [foo])]
fn init() {
- println!("init(baseline = {:?})", start);
+ hprintln!("init(baseline = {:?})", start).unwrap();
// `foo` inherits the baseline of `init`: `Instant(0)`
spawn.foo().unwrap();
@@ -36,7 +26,7 @@ const APP: () = {
fn foo() {
static mut ONCE: bool = true;
- println!("foo(baseline = {:?})", scheduled);
+ hprintln!("foo(baseline = {:?})", scheduled).unwrap();
if *ONCE {
*ONCE = false;
@@ -49,7 +39,7 @@ const APP: () = {
#[interrupt(spawn = [foo])]
fn UART0() {
- println!("UART0(baseline = {:?})", start);
+ hprintln!("UART0(baseline = {:?})", start).unwrap();
// `foo` inherits the baseline of `UART0`: its `start` time
spawn.foo().unwrap();
diff --git a/examples/capacity.rs b/examples/capacity.rs
index 2dea2c3..a7132ba 100644
--- a/examples/capacity.rs
+++ b/examples/capacity.rs
@@ -7,23 +7,13 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
- #[init(spawn = [foo])]
+ #[init]
fn init() {
rtfm::pend(Interrupt::UART0);
}
@@ -40,12 +30,12 @@ const APP: () = {
#[task(capacity = 4)]
fn foo(x: u32) {
- println!("foo({})", x);
+ hprintln!("foo({})", x).unwrap();
}
#[task]
fn bar() {
- println!("bar");
+ hprintln!("bar").unwrap();
debug::exit(debug::EXIT_SUCCESS);
}
diff --git a/examples/generics.rs b/examples/generics.rs
new file mode 100644
index 0000000..c8ce839
--- /dev/null
+++ b/examples/generics.rs
@@ -0,0 +1,62 @@
+//! examples/generics.rs
+
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![no_main]
+#![no_std]
+
+extern crate panic_semihosting;
+
+use cortex_m_semihosting::{debug, hprintln};
+use lm3s6965::Interrupt;
+use rtfm::{app, Mutex};
+
+#[app(device = lm3s6965)]
+const APP: () = {
+ static mut SHARED: u32 = 0;
+
+ #[init]
+ fn init() {
+ rtfm::pend(Interrupt::UART0);
+ rtfm::pend(Interrupt::UART1);
+ }
+
+ #[interrupt(resources = [SHARED])]
+ fn UART0() {
+ static mut STATE: u32 = 0;
+
+ hprintln!("UART0(STATE = {})", *STATE).unwrap();
+
+ advance(STATE, resources.SHARED);
+
+ rtfm::pend(Interrupt::UART1);
+
+ debug::exit(debug::EXIT_SUCCESS);
+ }
+
+ #[interrupt(priority = 2, resources = [SHARED])]
+ fn UART1() {
+ static mut STATE: u32 = 0;
+
+ hprintln!("UART1(STATE = {})", *STATE).unwrap();
+
+ // just to show that `SHARED` can be accessed directly and ..
+ *resources.SHARED += 0;
+ // .. also through a (no-op) `lock`
+ resources.SHARED.lock(|shared| *shared += 0);
+
+ advance(STATE, resources.SHARED);
+ }
+};
+
+fn advance(state: &mut u32, mut shared: impl Mutex<T = u32>) {
+ *state += 1;
+
+ let (old, new) = shared.lock(|shared| {
+ let old = *shared;
+ *shared += *state;
+ (old, *shared)
+ });
+
+ hprintln!("SHARED: {} -> {}", old, new).unwrap();
+}
diff --git a/examples/idle.rs b/examples/idle.rs
index 013ccce..1f21a37 100644
--- a/examples/idle.rs
+++ b/examples/idle.rs
@@ -7,24 +7,14 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
#[init]
fn init() {
- println!("init");
+ hprintln!("init").unwrap();
}
#[idle]
@@ -34,7 +24,7 @@ const APP: () = {
// Safe access to local `static mut` variable
let _x: &'static mut u32 = X;
- println!("idle");
+ hprintln!("idle").unwrap();
debug::exit(debug::EXIT_SUCCESS);
diff --git a/examples/init.rs b/examples/init.rs
index d6caa60..be6cfe3 100644
--- a/examples/init.rs
+++ b/examples/init.rs
@@ -7,21 +7,9 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use rtfm::app;
-// NOTE: This convenience macro will appear in all the other examples and
-// will always look the same
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
#[init]
@@ -37,7 +25,7 @@ const APP: () = {
// Safe access to local `static mut` variable
let _x: &'static mut u32 = X;
- println!("init");
+ hprintln!("init").unwrap();
debug::exit(debug::EXIT_SUCCESS);
}
diff --git a/examples/interrupt.rs b/examples/interrupt.rs
index 19b1fed..3c669d9 100644
--- a/examples/interrupt.rs
+++ b/examples/interrupt.rs
@@ -7,20 +7,10 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
#[init]
@@ -29,14 +19,14 @@ const APP: () = {
// `init` returns because interrupts are disabled
rtfm::pend(Interrupt::UART0);
- println!("init");
+ hprintln!("init").unwrap();
}
#[idle]
fn idle() -> ! {
// interrupts are enabled again; the `UART0` handler runs at this point
- println!("idle");
+ hprintln!("idle").unwrap();
rtfm::pend(Interrupt::UART0);
@@ -52,10 +42,11 @@ const APP: () = {
// Safe access to local `static mut` variable
*TIMES += 1;
- println!(
+ hprintln!(
"UART0 called {} time{}",
*TIMES,
if *TIMES > 1 { "s" } else { "" }
- );
+ )
+ .unwrap();
}
};
diff --git a/examples/late.rs b/examples/late.rs
index 6d76c58..be65640 100644
--- a/examples/late.rs
+++ b/examples/late.rs
@@ -7,7 +7,7 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use heapless::{
consts::*,
spsc::{Consumer, Producer, Queue},
@@ -15,16 +15,6 @@ use heapless::{
use lm3s6965::Interrupt;
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
// Late resources
@@ -49,7 +39,7 @@ const APP: () = {
fn idle() -> ! {
loop {
if let Some(byte) = resources.C.dequeue() {
- println!("received message: {}", byte);
+ hprintln!("received message: {}", byte).unwrap();
debug::exit(debug::EXIT_SUCCESS);
} else {
diff --git a/examples/lock.rs b/examples/lock.rs
index 097bd5c..4ca862e 100644
--- a/examples/lock.rs
+++ b/examples/lock.rs
@@ -7,20 +7,10 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
static mut SHARED: u32 = 0;
@@ -33,7 +23,7 @@ const APP: () = {
// when omitted priority is assumed to be `1`
#[interrupt(resources = [SHARED])]
fn GPIOA() {
- println!("A");
+ hprintln!("A").unwrap();
// the lower priority task requires a critical section to access the data
resources.SHARED.lock(|shared| {
@@ -43,7 +33,7 @@ const APP: () = {
// GPIOB will *not* run right now due to the critical section
rtfm::pend(Interrupt::GPIOB);
- println!("B - SHARED = {}", *shared);
+ hprintln!("B - SHARED = {}", *shared).unwrap();
// GPIOC does not contend for `SHARED` so it's allowed to run now
rtfm::pend(Interrupt::GPIOC);
@@ -51,7 +41,7 @@ const APP: () = {
// critical section is over: GPIOB can now start
- println!("E");
+ hprintln!("E").unwrap();
debug::exit(debug::EXIT_SUCCESS);
}
@@ -61,11 +51,11 @@ const APP: () = {
// the higher priority task does *not* need a critical section
*resources.SHARED += 1;
- println!("D - SHARED = {}", *resources.SHARED);
+ hprintln!("D - SHARED = {}", *resources.SHARED).unwrap();
}
#[interrupt(priority = 3)]
fn GPIOC() {
- println!("C");
+ hprintln!("C").unwrap();
}
};
diff --git a/examples/message.rs b/examples/message.rs
index 1ff08b2..b5d68a6 100644
--- a/examples/message.rs
+++ b/examples/message.rs
@@ -7,19 +7,9 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
#[init(spawn = [foo])]
@@ -31,7 +21,7 @@ const APP: () = {
fn foo() {
static mut COUNT: u32 = 0;
- println!("foo");
+ hprintln!("foo").unwrap();
spawn.bar(*COUNT).unwrap();
*COUNT += 1;
@@ -39,14 +29,14 @@ const APP: () = {
#[task(spawn = [baz])]
fn bar(x: u32) {
- println!("bar({})", x);
+ hprintln!("bar({})", x).unwrap();
spawn.baz(x + 1, x + 2).unwrap();
}
#[task(spawn = [foo])]
fn baz(x: u32, y: u32) {
- println!("baz({}, {})", x, y);
+ hprintln!("baz({}, {})", x, y).unwrap();
if x + y > 4 {
debug::exit(debug::EXIT_SUCCESS);
diff --git a/examples/periodic.rs b/examples/periodic.rs
index 0fb8bdf..ba2b493 100644
--- a/examples/periodic.rs
+++ b/examples/periodic.rs
@@ -7,18 +7,9 @@
extern crate panic_semihosting;
+use cortex_m_semihosting::hprintln;
use rtfm::{app, Instant};
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
const PERIOD: u32 = 8_000_000;
// NOTE: does NOT work on QEMU!
@@ -32,7 +23,7 @@ const APP: () = {
#[task(schedule = [foo])]
fn foo() {
let now = Instant::now();
- println!("foo(scheduled = {:?}, now = {:?})", scheduled, now);
+ hprintln!("foo(scheduled = {:?}, now = {:?})", scheduled, now).unwrap();
schedule.foo(scheduled + PERIOD.cycles()).unwrap();
}
diff --git a/examples/ramfunc.rs b/examples/ramfunc.rs
index b7fe252..37ea82a 100644
--- a/examples/ramfunc.rs
+++ b/examples/ramfunc.rs
@@ -7,19 +7,9 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
#[init(spawn = [bar])]
@@ -30,7 +20,7 @@ const APP: () = {
#[inline(never)]
#[task]
fn foo() {
- println!("foo");
+ hprintln!("foo").unwrap();
debug::exit(debug::EXIT_SUCCESS);
}
diff --git a/examples/resource.rs b/examples/resource.rs
index 2777da1..5ddab9e 100644
--- a/examples/resource.rs
+++ b/examples/resource.rs
@@ -7,20 +7,10 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
// A resource
@@ -47,7 +37,7 @@ const APP: () = {
fn UART0() {
*resources.SHARED += 1;
- println!("UART0: SHARED = {}", resources.SHARED);
+ hprintln!("UART0: SHARED = {}", resources.SHARED).unwrap();
}
// `SHARED` can be access from this context
@@ -55,6 +45,6 @@ const APP: () = {
fn UART1() {
*resources.SHARED += 1;
- println!("UART1: SHARED = {}", resources.SHARED);
+ hprintln!("UART1: SHARED = {}", resources.SHARED).unwrap();
}
};
diff --git a/examples/schedule.rs b/examples/schedule.rs
index 9fb2796..fd63347 100644
--- a/examples/schedule.rs
+++ b/examples/schedule.rs
@@ -7,18 +7,9 @@
extern crate panic_semihosting;
+use cortex_m_semihosting::hprintln;
use rtfm::{app, Instant};
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
// NOTE: does NOT work on QEMU!
#[app(device = lm3s6965)]
const APP: () = {
@@ -26,7 +17,7 @@ const APP: () = {
fn init() {
let now = Instant::now();
- println!("init @ {:?}", now);
+ hprintln!("init @ {:?}", now).unwrap();
// Schedule `foo` to run 8e6 cycles (clock cycles) in the future
schedule.foo(now + 8_000_000.cycles()).unwrap();
@@ -37,12 +28,12 @@ const APP: () = {
#[task]
fn foo() {
- println!("foo @ {:?}", Instant::now());
+ hprintln!("foo @ {:?}", Instant::now()).unwrap();
}
#[task]
fn bar() {
- println!("bar @ {:?}", Instant::now());
+ hprintln!("bar @ {:?}", Instant::now()).unwrap();
}
extern "C" {
diff --git a/examples/singleton.rs b/examples/singleton.rs
index 888a5a6..79815e8 100644
--- a/examples/singleton.rs
+++ b/examples/singleton.rs
@@ -8,20 +8,10 @@
extern crate panic_semihosting;
use alloc_singleton::stable::pool::{Box, Pool};
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
#[Singleton(Send)]
@@ -48,7 +38,7 @@ const APP: () = {
#[task(resources = [P])]
fn foo(x: Box<M>) {
- println!("foo({})", x);
+ hprintln!("foo({})", x).unwrap();
resources.P.lock(|p| p.dealloc(x));
@@ -57,7 +47,7 @@ const APP: () = {
#[task(priority = 2, resources = [P])]
fn bar(x: Box<M>) {
- println!("bar({})", x);
+ hprintln!("bar({})", x).unwrap();
resources.P.dealloc(x);
}
diff --git a/examples/static.rs b/examples/static.rs
index 3dc0e89..d40fdb1 100644
--- a/examples/static.rs
+++ b/examples/static.rs
@@ -7,20 +7,10 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
static KEY: u32 = ();
@@ -35,13 +25,13 @@ const APP: () = {
#[interrupt(resources = [KEY])]
fn UART0() {
- println!("UART0(KEY = {:#x})", resources.KEY);
+ hprintln!("UART0(KEY = {:#x})", resources.KEY).unwrap();
debug::exit(debug::EXIT_SUCCESS);
}
#[interrupt(priority = 2, resources = [KEY])]
fn UART1() {
- println!("UART1(KEY = {:#x})", resources.KEY);
+ hprintln!("UART1(KEY = {:#x})", resources.KEY).unwrap();
}
};
diff --git a/examples/task.rs b/examples/task.rs
index b1cd7ae..4f168bb 100644
--- a/examples/task.rs
+++ b/examples/task.rs
@@ -7,19 +7,9 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
#[app(device = lm3s6965)]
const APP: () = {
#[init(spawn = [foo])]
@@ -29,7 +19,7 @@ const APP: () = {
#[task(spawn = [bar, baz])]
fn foo() {
- println!("foo");
+ hprintln!("foo").unwrap();
// spawns `bar` onto the task scheduler
// `foo` and `bar` have the same priority so `bar` will not run until
@@ -43,14 +33,14 @@ const APP: () = {
#[task]
fn bar() {
- println!("bar");
+ hprintln!("bar").unwrap();
debug::exit(debug::EXIT_SUCCESS);
}
#[task(priority = 2)]
fn baz() {
- println!("baz");
+ hprintln!("baz").unwrap();
}
// Interrupt handlers used to dispatch software tasks
diff --git a/examples/types.rs b/examples/types.rs
index 6606208..c1b8cd6 100644
--- a/examples/types.rs
+++ b/examples/types.rs
@@ -8,7 +8,7 @@
extern crate panic_semihosting;
use cortex_m_semihosting::debug;
-use rtfm::{app, Instant};
+use rtfm::{app, Exclusive, Instant};
#[app(device = lm3s6965)]
const APP: () = {
@@ -43,6 +43,7 @@ const APP: () = {
#[task(priority = 2, resources = [SHARED], schedule = [foo], spawn = [foo])]
fn foo() {
let _: Instant = scheduled;
+ let _: Exclusive<u32> = resources.SHARED;
let _: foo::Resources = resources;
let _: foo::Schedule = schedule;
let _: foo::Spawn = spawn;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-27 05:22:04 +0000