From 1fe587c5160b9e99bbb67644318cb9e5c9c56b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Wed, 11 Jan 2023 21:33:44 +0100
Subject: Remove unwrap() from hprintln!()

sd 'hprintln(.*).unwrap\(\)' 'hprintln' (fd -e rs .)
---
 examples/generics.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'examples/generics.rs')

diff --git a/examples/generics.rs b/examples/generics.rs
index 72b861b..f9a6aac 100644
--- a/examples/generics.rs
+++ b/examples/generics.rs
@@ -32,7 +32,7 @@ mod app {
 
     #[task(binds = UART0, shared = [shared], local = [state: u32 = 0])]
     fn uart0(c: uart0::Context) {
-        hprintln!("UART0(STATE = {})", *c.local.state).unwrap();
+        hprintln!("UART0(STATE = {})", *c.local.state);
 
         // second argument has type `shared::shared`
         super::advance(c.local.state, c.shared.shared);
@@ -44,7 +44,7 @@ mod app {
 
     #[task(binds = UART1, priority = 2, shared = [shared], local = [state: u32 = 0])]
     fn uart1(c: uart1::Context) {
-        hprintln!("UART1(STATE = {})", *c.local.state).unwrap();
+        hprintln!("UART1(STATE = {})", *c.local.state);
 
         // second argument has type `shared::shared`
         super::advance(c.local.state, c.shared.shared);
@@ -61,5 +61,5 @@ fn advance(state: &mut u32, mut shared: impl Mutex<T = u32>) {
         (old, *shared)
     });
 
-    hprintln!("shared: {} -> {}", old, new).unwrap();
+    hprintln!("shared: {} -> {}", old, new);
 }
-- 
cgit v1.2.3


From 9764121cc1cdd6a7c27e86fa8d65bb6d2d48dc27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Sat, 14 Jan 2023 11:24:51 +0100
Subject: Upgrade of semihosting changed timing

New semihosting 0.5 does not use error handling,
returns directly and as semihosting is generally slow
this led to missing print statements.

Workaround is to add NOP, which seems sufficient
to let it flush the buffers
---
 examples/generics.rs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'examples/generics.rs')

diff --git a/examples/generics.rs b/examples/generics.rs
index f9a6aac..6243d56 100644
--- a/examples/generics.rs
+++ b/examples/generics.rs
@@ -39,6 +39,9 @@ mod app {
 
         rtic::pend(Interrupt::UART1);
 
+        // Exit moved after nop to ensure that rtic::pend gets
+        // to run before exiting
+        cortex_m::asm::nop();
         debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
     }
 
-- 
cgit v1.2.3