From 582c602912592ec7ebea3096aefa02aea99c2143 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Mon, 2 Jan 2023 14:34:05 +0100
Subject: Old xtask test pass

---
 examples/multilock.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'examples/multilock.rs')

diff --git a/examples/multilock.rs b/examples/multilock.rs
index c7085cd..d99bae6 100644
--- a/examples/multilock.rs
+++ b/examples/multilock.rs
@@ -2,7 +2,6 @@
 
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![deny(missing_docs)]
 #![no_main]
 #![no_std]
 
@@ -49,7 +48,7 @@ mod app {
             *s2 += 1;
             *s3 += 1;
 
-            hprintln!("Multiple locks, s1: {}, s2: {}, s3: {}", *s1, *s2, *s3);
+            hprintln!("Multiple locks, s1: {}, s2: {}, s3: {}", *s1, *s2, *s3).unwrap();
         });
 
         debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
-- 
cgit v1.2.3


From 569a761122f15a92671b299603a5dc7fe6e5324b Mon Sep 17 00:00:00 2001
From: Per Lindgren <per.lindgren@ltu.se>
Date: Sat, 7 Jan 2023 14:27:57 +0100
Subject: examples/multiloc fixed

---
 examples/multilock.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'examples/multilock.rs')

diff --git a/examples/multilock.rs b/examples/multilock.rs
index d99bae6..7bea2d3 100644
--- a/examples/multilock.rs
+++ b/examples/multilock.rs
@@ -4,6 +4,7 @@
 #![deny(warnings)]
 #![no_main]
 #![no_std]
+#![feature(type_alias_impl_trait)]
 
 use panic_semihosting as _;
 
@@ -22,7 +23,7 @@ mod app {
     struct Local {}
 
     #[init]
-    fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {
+    fn init(_: init::Context) -> (Shared, Local) {
         locks::spawn().unwrap();
 
         (
@@ -32,13 +33,12 @@ mod app {
                 shared3: 0,
             },
             Local {},
-            init::Monotonics(),
         )
     }
 
     // when omitted priority is assumed to be `1`
     #[task(shared = [shared1, shared2, shared3])]
-    fn locks(c: locks::Context) {
+    async fn locks(c: locks::Context) {
         let s1 = c.shared.shared1;
         let s2 = c.shared.shared2;
         let s3 = c.shared.shared3;
-- 
cgit v1.2.3


From ceaf3613d3256f60b139a4f93220e3c298603b83 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sun, 8 Jan 2023 19:40:31 +0100
Subject: Update semihosting

---
 examples/multilock.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/multilock.rs')

diff --git a/examples/multilock.rs b/examples/multilock.rs
index 7bea2d3..2eb285e 100644
--- a/examples/multilock.rs
+++ b/examples/multilock.rs
@@ -48,7 +48,7 @@ mod app {
             *s2 += 1;
             *s3 += 1;
 
-            hprintln!("Multiple locks, s1: {}, s2: {}, s3: {}", *s1, *s2, *s3).unwrap();
+            hprintln!("Multiple locks, s1: {}, s2: {}, s3: {}", *s1, *s2, *s3);
         });
 
         debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
-- 
cgit v1.2.3


From b8b881f446a226d6f3c4a7db7c9174590b47dbf6 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Thu, 19 Jan 2023 13:56:59 +0100
Subject: Fix so deny(missing_docs) work

---
 examples/multilock.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'examples/multilock.rs')

diff --git a/examples/multilock.rs b/examples/multilock.rs
index 2eb285e..6208cac 100644
--- a/examples/multilock.rs
+++ b/examples/multilock.rs
@@ -2,6 +2,7 @@
 
 #![deny(unsafe_code)]
 #![deny(warnings)]
+#![deny(missing_docs)]
 #![no_main]
 #![no_std]
 #![feature(type_alias_impl_trait)]
-- 
cgit v1.2.3


From 306aa47170fd59369b7a184924e287dc3706d64d Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Mon, 23 Jan 2023 20:05:47 +0100
Subject: Add rtic-timer (timerqueue + monotonic) and rtic-monotonics
 (systick-monotonic)

---
 examples/multilock.rs | 57 ---------------------------------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 examples/multilock.rs

(limited to 'examples/multilock.rs')

diff --git a/examples/multilock.rs b/examples/multilock.rs
deleted file mode 100644
index 6208cac..0000000
--- a/examples/multilock.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-//! examples/mutlilock.rs
-
-#![deny(unsafe_code)]
-#![deny(warnings)]
-#![deny(missing_docs)]
-#![no_main]
-#![no_std]
-#![feature(type_alias_impl_trait)]
-
-use panic_semihosting as _;
-
-#[rtic::app(device = lm3s6965, dispatchers = [GPIOA])]
-mod app {
-    use cortex_m_semihosting::{debug, hprintln};
-
-    #[shared]
-    struct Shared {
-        shared1: u32,
-        shared2: u32,
-        shared3: u32,
-    }
-
-    #[local]
-    struct Local {}
-
-    #[init]
-    fn init(_: init::Context) -> (Shared, Local) {
-        locks::spawn().unwrap();
-
-        (
-            Shared {
-                shared1: 0,
-                shared2: 0,
-                shared3: 0,
-            },
-            Local {},
-        )
-    }
-
-    // when omitted priority is assumed to be `1`
-    #[task(shared = [shared1, shared2, shared3])]
-    async fn locks(c: locks::Context) {
-        let s1 = c.shared.shared1;
-        let s2 = c.shared.shared2;
-        let s3 = c.shared.shared3;
-
-        (s1, s2, s3).lock(|s1, s2, s3| {
-            *s1 += 1;
-            *s2 += 1;
-            *s3 += 1;
-
-            hprintln!("Multiple locks, s1: {}, s2: {}, s3: {}", *s1, *s2, *s3);
-        });
-
-        debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
-    }
-}
-- 
cgit v1.2.3