From 555f36857ec93bed26ff4249593992f500b7c4ab Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sat, 20 Feb 2021 19:22:45 +0100
Subject: Test fixes

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

(limited to 'examples/schedule.rs')

diff --git a/examples/schedule.rs b/examples/schedule.rs
index 5f73c50..6f6f8cb 100644
--- a/examples/schedule.rs
+++ b/examples/schedule.rs
@@ -8,14 +8,14 @@
 use panic_halt as _;
 
 // NOTE: does NOT work on QEMU!
-#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT, dispatchers = [SSI0])]
+#[rtic::app(device = lm3s6965, dispatchers = [SSI0])]
 mod app {
     use cortex_m::peripheral::DWT;
     use cortex_m_semihosting::hprintln;
     use rtic::cyccnt::{Instant, U32Ext as _};
 
     #[init()]
-    fn init(mut cx: init::Context) -> init::LateResources {
+    fn init(mut cx: init::Context) -> (init::LateResources, init::Monotonics) {
         // Initialize (enable) the monotonic timer (CYCCNT)
         cx.core.DCB.enable_trace();
         // required on Cortex-M7 devices that software lock the DWT (e.g. STM32F7)
@@ -34,7 +34,7 @@ mod app {
         // Schedule `bar` to run 4e6 cycles in the future
         bar::schedule(now + 4_000_000.cycles()).unwrap();
 
-        init::LateResources {}
+        (init::LateResources {}, init::Monotonics())
     }
 
     #[task]
-- 
cgit v1.2.3


From cd3484cbab3c4cd7e483e8de19bcdd9498443412 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Tue, 23 Feb 2021 19:35:26 +0100
Subject: GHA update

Fmt fixes

Spawn_after did not work with parameters

Examples working again

Revert "GHA update"

This reverts commit e0a71d4859966a6c5cf2629d3cb27e88acada9c0.

Readd flags

Only add DWT based dep with __v7 flag
---
 examples/schedule.rs | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'examples/schedule.rs')

diff --git a/examples/schedule.rs b/examples/schedule.rs
index 6f6f8cb..cdbdc0d 100644
--- a/examples/schedule.rs
+++ b/examples/schedule.rs
@@ -10,40 +10,42 @@ use panic_halt as _;
 // NOTE: does NOT work on QEMU!
 #[rtic::app(device = lm3s6965, dispatchers = [SSI0])]
 mod app {
-    use cortex_m::peripheral::DWT;
     use cortex_m_semihosting::hprintln;
-    use rtic::cyccnt::{Instant, U32Ext as _};
+    use dwt_systick_monotonic::{
+        consts::{U0, U8},
+        DwtSystick,
+    };
+    use rtic::time::duration::Seconds;
+
+    #[monotonic(binds = SysTick, default = true)]
+    type MyMono = DwtSystick<U8, U0, U0>; // 8 MHz
 
     #[init()]
-    fn init(mut cx: init::Context) -> (init::LateResources, init::Monotonics) {
-        // Initialize (enable) the monotonic timer (CYCCNT)
-        cx.core.DCB.enable_trace();
-        // required on Cortex-M7 devices that software lock the DWT (e.g. STM32F7)
-        DWT::unlock();
-        cx.core.DWT.enable_cycle_counter();
+    fn init(cx: init::Context) -> (init::LateResources, init::Monotonics) {
+        let mut dcb = cx.core.DCB;
+        let dwt = cx.core.DWT;
+        let systick = cx.core.SYST;
 
-        // semantically, the monotonic timer is frozen at time "zero" during `init`
-        // NOTE do *not* call `Instant::now` in this context; it will return a nonsense value
-        let now = cx.start; // the start time of the system
+        let mono = DwtSystick::new(&mut dcb, dwt, systick, 8_000_000);
 
-        hprintln!("init @ {:?}", now).unwrap();
+        hprintln!("init").unwrap();
 
-        // Schedule `foo` to run 8e6 cycles (clock cycles) in the future
-        foo::schedule(now + 8_000_000.cycles()).unwrap();
+        // Schedule `foo` to run 1 second in the future
+        foo::spawn_after(Seconds(1_u32)).unwrap();
 
-        // Schedule `bar` to run 4e6 cycles in the future
-        bar::schedule(now + 4_000_000.cycles()).unwrap();
+        // Schedule `bar` to run 2 seconds in the future
+        bar::spawn_after(Seconds(2_u32)).unwrap();
 
-        (init::LateResources {}, init::Monotonics())
+        (init::LateResources {}, init::Monotonics(mono))
     }
 
     #[task]
     fn foo(_: foo::Context) {
-        hprintln!("foo  @ {:?}", Instant::now()).unwrap();
+        hprintln!("foo").unwrap();
     }
 
     #[task]
     fn bar(_: bar::Context) {
-        hprintln!("bar  @ {:?}", Instant::now()).unwrap();
+        hprintln!("bar").unwrap();
     }
 }
-- 
cgit v1.2.3


From 612efaf0c436489e1cf09c2e87b329a7318f71b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@grepit.se>
Date: Wed, 3 Mar 2021 08:53:03 +0100
Subject: Use panic_semihosting for all examples

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

(limited to 'examples/schedule.rs')

diff --git a/examples/schedule.rs b/examples/schedule.rs
index cdbdc0d..d6d4499 100644
--- a/examples/schedule.rs
+++ b/examples/schedule.rs
@@ -5,7 +5,7 @@
 #![no_main]
 #![no_std]
 
-use panic_halt as _;
+use panic_semihosting as _;
 
 // NOTE: does NOT work on QEMU!
 #[rtic::app(device = lm3s6965, dispatchers = [SSI0])]
-- 
cgit v1.2.3