aboutsummaryrefslogtreecommitdiff
path: root/examples/generics.rs
diff options
context:
space:
mode:
authorGravatar Jorge Aparicio <jorge@japaric.io> 2018-11-04 19:57:39 +0100
committerGravatar Jorge Aparicio <jorge@japaric.io> 2018-11-04 19:57:39 +0100
commita2792182952c953aab2c442bb02ac1f2e4986e67 (patch)
tree00e10c34cc22f80aee45c51d945e31c237c74eeb /examples/generics.rs
parent22d758ddacddda429c9aaeaa0e132ae1c1fd4a2f (diff)
downloadrtic-a2792182952c953aab2c442bb02ac1f2e4986e67.tar.gz
rtic-a2792182952c953aab2c442bb02ac1f2e4986e67.tar.zst
rtic-a2792182952c953aab2c442bb02ac1f2e4986e67.zip
use new cortex_m_semihosting::hprintln macro
Diffstat (limited to 'examples/generics.rs')
-rw-r--r--examples/generics.rs20
1 files changed, 4 insertions, 16 deletions
diff --git a/examples/generics.rs b/examples/generics.rs
index aee70611..c8ce8393 100644
--- a/examples/generics.rs
+++ b/examples/generics.rs
@@ -7,22 +7,10 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use rtfm::{app, Mutex};
-// 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: () = {
static mut SHARED: u32 = 0;
@@ -37,7 +25,7 @@ const APP: () = {
fn UART0() {
static mut STATE: u32 = 0;
- println!("UART0(STATE = {})", *STATE);
+ hprintln!("UART0(STATE = {})", *STATE).unwrap();
advance(STATE, resources.SHARED);
@@ -50,7 +38,7 @@ const APP: () = {
fn UART1() {
static mut STATE: u32 = 0;
- println!("UART1(STATE = {})", *STATE);
+ hprintln!("UART1(STATE = {})", *STATE).unwrap();
// just to show that `SHARED` can be accessed directly and ..
*resources.SHARED += 0;
@@ -70,5 +58,5 @@ fn advance(state: &mut u32, mut shared: impl Mutex<T = u32>) {
(old, *shared)
});
- println!("SHARED: {} -> {}", old, new);
+ hprintln!("SHARED: {} -> {}", old, new).unwrap();
}