From 0dcb0c4e497b23bf68b7ac0d3d918ab3d3c209be Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Sun, 31 Oct 2021 10:09:40 +0100 Subject: New monotonic trait working --- examples/t-schedule.rs | 57 ++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 32 deletions(-) (limited to 'examples/t-schedule.rs') diff --git a/examples/t-schedule.rs b/examples/t-schedule.rs index 5530ec6..6ee08af 100644 --- a/examples/t-schedule.rs +++ b/examples/t-schedule.rs @@ -10,8 +10,7 @@ use panic_semihosting as _; #[rtic::app(device = lm3s6965, dispatchers = [SSI0])] mod app { use cortex_m_semihosting::debug; - use rtic::time::duration::Seconds; - use systick_monotonic::Systick; + use systick_monotonic::*; #[monotonic(binds = SysTick, default = true)] type MyMono = Systick<100>; // 100 Hz / 10 ms granularity @@ -40,27 +39,26 @@ mod app { // Not default let _: Result = foo::MyMono::spawn_at(monotonics::MyMono::now()); - let handle: Result = foo::MyMono::spawn_after(Seconds(1_u32)); - let _: Result = - handle.unwrap().reschedule_after(Seconds(1_u32)); + let handle: Result = foo::MyMono::spawn_after(1.secs()); + let _: Result = handle.unwrap().reschedule_after(1.secs()); - let handle: Result = foo::MyMono::spawn_after(Seconds(1_u32)); + let handle: Result = foo::MyMono::spawn_after(1.secs()); let _: Result = handle.unwrap().reschedule_at(monotonics::MyMono::now()); - let handle: Result = foo::MyMono::spawn_after(Seconds(1_u32)); + let handle: Result = foo::MyMono::spawn_after(1.secs()); let _: Result<(), ()> = handle.unwrap().cancel(); // Using default let _: Result = foo::spawn_at(monotonics::now()); - let handle: Result = foo::spawn_after(Seconds(1_u32)); - let _: Result = handle.unwrap().reschedule_after(Seconds(1_u32)); + let handle: Result = foo::spawn_after(1.secs()); + let _: Result = handle.unwrap().reschedule_after(1.secs()); - let handle: Result = foo::spawn_after(Seconds(1_u32)); + let handle: Result = foo::spawn_after(1.secs()); let _: Result = handle.unwrap().reschedule_at(monotonics::MyMono::now()); - let handle: Result = foo::spawn_after(Seconds(1_u32)); + let handle: Result = foo::spawn_after(1.secs()); let _: Result<(), ()> = handle.unwrap().cancel(); // Task with single message passing @@ -68,30 +66,26 @@ mod app { // Not default let _: Result = bar::MyMono::spawn_at(monotonics::MyMono::now(), 0); - let handle: Result = - bar::MyMono::spawn_after(Seconds(1_u32), 0); - let _: Result = - handle.unwrap().reschedule_after(Seconds(1_u32)); + let handle: Result = bar::MyMono::spawn_after(1.secs(), 1); + let _: Result = handle.unwrap().reschedule_after(1.secs()); - let handle: Result = - bar::MyMono::spawn_after(Seconds(1_u32), 0); + let handle: Result = bar::MyMono::spawn_after(1.secs(), 1); let _: Result = handle.unwrap().reschedule_at(monotonics::MyMono::now()); - let handle: Result = - bar::MyMono::spawn_after(Seconds(1_u32), 0); + let handle: Result = bar::MyMono::spawn_after(1.secs(), 1); let _: Result = handle.unwrap().cancel(); // Using default let _: Result = bar::spawn_at(monotonics::MyMono::now(), 0); - let handle: Result = bar::spawn_after(Seconds(1_u32), 0); - let _: Result = handle.unwrap().reschedule_after(Seconds(1_u32)); + let handle: Result = bar::spawn_after(1.secs(), 1); + let _: Result = handle.unwrap().reschedule_after(1.secs()); - let handle: Result = bar::spawn_after(Seconds(1_u32), 0); + let handle: Result = bar::spawn_after(1.secs(), 1); let _: Result = handle.unwrap().reschedule_at(monotonics::MyMono::now()); - let handle: Result = bar::spawn_after(Seconds(1_u32), 0); + let handle: Result = bar::spawn_after(1.secs(), 1); let _: Result = handle.unwrap().cancel(); // Task with multiple message passing @@ -100,30 +94,29 @@ mod app { let _: Result = baz::MyMono::spawn_at(monotonics::MyMono::now(), 0, 1); let handle: Result = - baz::MyMono::spawn_after(Seconds(1_u32), 0, 1); - let _: Result = - handle.unwrap().reschedule_after(Seconds(1_u32)); + baz::MyMono::spawn_after(1.secs(), 1, 2); + let _: Result = handle.unwrap().reschedule_after(1.secs()); let handle: Result = - baz::MyMono::spawn_after(Seconds(1_u32), 0, 1); + baz::MyMono::spawn_after(1.secs(), 1, 2); let _: Result = handle.unwrap().reschedule_at(monotonics::MyMono::now()); let handle: Result = - baz::MyMono::spawn_after(Seconds(1_u32), 0, 1); + baz::MyMono::spawn_after(1.secs(), 1, 2); let _: Result<(u32, u32), ()> = handle.unwrap().cancel(); // Using default let _: Result = baz::spawn_at(monotonics::MyMono::now(), 0, 1); - let handle: Result = baz::spawn_after(Seconds(1_u32), 0, 1); - let _: Result = handle.unwrap().reschedule_after(Seconds(1_u32)); + let handle: Result = baz::spawn_after(1.secs(), 1, 2); + let _: Result = handle.unwrap().reschedule_after(1.secs()); - let handle: Result = baz::spawn_after(Seconds(1_u32), 0, 1); + let handle: Result = baz::spawn_after(1.secs(), 1, 2); let _: Result = handle.unwrap().reschedule_at(monotonics::MyMono::now()); - let handle: Result = baz::spawn_after(Seconds(1_u32), 0, 1); + let handle: Result = baz::spawn_after(1.secs(), 1, 2); let _: Result<(u32, u32), ()> = handle.unwrap().cancel(); loop { -- cgit v1.2.3