diff options
Diffstat (limited to 'examples')
38 files changed, 108 insertions, 82 deletions
diff --git a/examples/baseline.rs b/examples/baseline.rs index 0b7e3ea0..82f1887e 100644 --- a/examples/baseline.rs +++ b/examples/baseline.rs @@ -5,13 +5,14 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use lm3s6965::Interrupt; use panic_semihosting as _; // NOTE: does NOT properly work on QEMU #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; + #[init] fn init(cx: init::Context) -> init::LateResources { // omitted: initialization of `CYCCNT` diff --git a/examples/binds.rs b/examples/binds.rs index 42010ae2..f681aa57 100644 --- a/examples/binds.rs +++ b/examples/binds.rs @@ -5,13 +5,14 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use lm3s6965::Interrupt; use panic_semihosting as _; // `examples/interrupt.rs` rewritten to use `binds` #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; + #[init] fn init(_: init::Context) -> init::LateResources { rtic::pend(Interrupt::UART0); diff --git a/examples/capacity.rs b/examples/capacity.rs index f903acbc..29b4f04e 100644 --- a/examples/capacity.rs +++ b/examples/capacity.rs @@ -5,12 +5,13 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use lm3s6965::Interrupt; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; + #[init] fn init(_: init::Context) -> init::LateResources { rtic::pend(Interrupt::UART0); diff --git a/examples/cfg.rs b/examples/cfg.rs index c8892eaf..f900286b 100644 --- a/examples/cfg.rs +++ b/examples/cfg.rs @@ -5,13 +5,14 @@ #![no_main] #![no_std] -use cortex_m_semihosting::debug; -#[cfg(debug_assertions)] -use cortex_m_semihosting::hprintln; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::debug; + #[cfg(debug_assertions)] + use cortex_m_semihosting::hprintln; + #[resources] struct Resources { #[cfg(debug_assertions)] // <- `true` when using the `dev` profile diff --git a/examples/destructure.rs b/examples/destructure.rs index e7c53237..3c5eabf7 100644 --- a/examples/destructure.rs +++ b/examples/destructure.rs @@ -5,12 +5,13 @@ #![no_main] #![no_std] -use cortex_m_semihosting::hprintln; -use lm3s6965::Interrupt; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::hprintln; + use lm3s6965::Interrupt; + #[resources] struct Resources { // Some resources to work with diff --git a/examples/double_schedule.rs b/examples/double_schedule.rs index d242c57e..78eaac49 100644 --- a/examples/double_schedule.rs +++ b/examples/double_schedule.rs @@ -6,10 +6,10 @@ #![no_std] use panic_semihosting as _; -use rtic::cyccnt::U32Ext; #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)] mod app { + use rtic::cyccnt::U32Ext; #[resources] struct Resources { diff --git a/examples/generics.rs b/examples/generics.rs index 3107dd11..16327fb3 100644 --- a/examples/generics.rs +++ b/examples/generics.rs @@ -5,13 +5,16 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use lm3s6965::Interrupt; +use cortex_m_semihosting::hprintln; use panic_semihosting as _; -use rtic::{Exclusive, Mutex}; +use rtic::Mutex; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; + use rtic::Exclusive; + #[resources] struct Resources { #[init(0)] @@ -33,7 +36,7 @@ mod app { hprintln!("UART0(STATE = {})", *STATE).unwrap(); // second argument has type `resources::shared` - advance(STATE, c.resources.shared); + super::advance(STATE, c.resources.shared); rtic::pend(Interrupt::UART1); @@ -50,7 +53,7 @@ mod app { *c.resources.shared += 0; // second argument has type `Exclusive<u32>` - advance(STATE, Exclusive(c.resources.shared)); + super::advance(STATE, Exclusive(c.resources.shared)); } } diff --git a/examples/hardware.rs b/examples/hardware.rs index f6a2d375..99e8da2e 100644 --- a/examples/hardware.rs +++ b/examples/hardware.rs @@ -5,12 +5,13 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use lm3s6965::Interrupt; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; + #[init] fn init(_: init::Context) -> init::LateResources { // Pends the UART0 interrupt but its handler won't run until *after* diff --git a/examples/idle.rs b/examples/idle.rs index 58c3c87d..1aac56c2 100644 --- a/examples/idle.rs +++ b/examples/idle.rs @@ -5,11 +5,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + #[init] fn init(_: init::Context) -> init::LateResources { hprintln!("init").unwrap(); diff --git a/examples/init.rs b/examples/init.rs index 6ac284a1..ca67a2b7 100644 --- a/examples/init.rs +++ b/examples/init.rs @@ -5,11 +5,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; use panic_semihosting as _; #[rtic::app(device = lm3s6965, peripherals = true)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + #[init] fn init(cx: init::Context) -> init::LateResources { static mut X: u32 = 0; diff --git a/examples/late.rs b/examples/late.rs index 761c68f5..d20a69c5 100644 --- a/examples/late.rs +++ b/examples/late.rs @@ -5,21 +5,18 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use heapless::{ - consts::*, - i, - spsc::{Consumer, Producer, Queue}, -}; -use lm3s6965::Interrupt; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; use heapless::{ consts::*, - spsc::{Consumer, Producer}, + i, + spsc::{Consumer, Producer, Queue}, }; + use lm3s6965::Interrupt; + // Late resources #[resources] struct Resources { diff --git a/examples/lock.rs b/examples/lock.rs index 669b1aed..c4930a28 100644 --- a/examples/lock.rs +++ b/examples/lock.rs @@ -5,12 +5,13 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use lm3s6965::Interrupt; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; + #[resources] struct Resources { #[init(0)] diff --git a/examples/message.rs b/examples/message.rs index 5ff6288a..4306430f 100644 --- a/examples/message.rs +++ b/examples/message.rs @@ -5,11 +5,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + #[init] fn init(_: init::Context) -> init::LateResources { foo::spawn(/* no message */).unwrap(); diff --git a/examples/not-sync.rs b/examples/not-sync.rs index 75412e63..d2616ee9 100644 --- a/examples/not-sync.rs +++ b/examples/not-sync.rs @@ -6,8 +6,6 @@ #![no_std] use core::marker::PhantomData; - -use cortex_m_semihosting::debug; use panic_halt as _; pub struct NotSync { @@ -18,6 +16,7 @@ pub struct NotSync { mod app { use super::NotSync; use core::marker::PhantomData; + use cortex_m_semihosting::debug; #[resources] struct Resources { diff --git a/examples/only-shared-access.rs b/examples/only-shared-access.rs index 91d0b7ad..8d42fd4d 100644 --- a/examples/only-shared-access.rs +++ b/examples/only-shared-access.rs @@ -5,12 +5,13 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use lm3s6965::Interrupt; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; + #[resources] struct Resources { key: u32, diff --git a/examples/periodic.rs b/examples/periodic.rs index 95cd1451..eedf720c 100644 --- a/examples/periodic.rs +++ b/examples/periodic.rs @@ -5,15 +5,15 @@ #![no_main] #![no_std] -use cortex_m_semihosting::hprintln; use panic_semihosting as _; -use rtic::cyccnt::{Instant, U32Ext}; - -const PERIOD: u32 = 8_000_000; // NOTE: does NOT work on QEMU! #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)] mod app { + use cortex_m_semihosting::hprintln; + use rtic::cyccnt::{Instant, U32Ext}; + + const PERIOD: u32 = 8_000_000; #[init] fn init(cx: init::Context) -> init::LateResources { diff --git a/examples/peripherals-taken.rs b/examples/peripherals-taken.rs index 09f92427..98f06b08 100644 --- a/examples/peripherals-taken.rs +++ b/examples/peripherals-taken.rs @@ -3,11 +3,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::debug; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::debug; + #[init] fn init(_: init::Context) -> init::LateResources { assert!(cortex_m::Peripherals::take().is_none()); diff --git a/examples/pool.rs b/examples/pool.rs index 2ad99841..fc740fea 100644 --- a/examples/pool.rs +++ b/examples/pool.rs @@ -5,12 +5,10 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; use heapless::{ pool, pool::singleton::{Box, Pool}, }; -use lm3s6965::Interrupt; use panic_semihosting as _; use rtic::app; @@ -19,7 +17,9 @@ pool!(P: [u8; 128]); #[app(device = lm3s6965)] mod app { - use crate::Box; + use crate::{Box, Pool}; + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; // Import the memory pool into scope use super::P; diff --git a/examples/preempt.rs b/examples/preempt.rs index f6fc4b05..ee75c46f 100644 --- a/examples/preempt.rs +++ b/examples/preempt.rs @@ -3,13 +3,14 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use lm3s6965::Interrupt; use panic_semihosting as _; use rtic::app; #[app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; + #[init] fn init(_: init::Context) -> init::LateResources { rtic::pend(Interrupt::GPIOA); diff --git a/examples/ramfunc.rs b/examples/ramfunc.rs index 84d633dd..4d46c6dd 100644 --- a/examples/ramfunc.rs +++ b/examples/ramfunc.rs @@ -5,11 +5,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + #[init] fn init(_: init::Context) -> init::LateResources { foo::spawn().unwrap(); diff --git a/examples/resource-user-struct.rs b/examples/resource-user-struct.rs index a5bd0ddf..ca4ca2af 100644 --- a/examples/resource-user-struct.rs +++ b/examples/resource-user-struct.rs @@ -5,12 +5,13 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use lm3s6965::Interrupt; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; + #[resources] struct Resources { // A resource diff --git a/examples/resource.rs b/examples/resource.rs index 273af26a..87ba3367 100644 --- a/examples/resource.rs +++ b/examples/resource.rs @@ -5,12 +5,13 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use lm3s6965::Interrupt; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; + #[resources] struct Resources { // A resource diff --git a/examples/schedule.rs b/examples/schedule.rs index fa67a566..f57f53f5 100644 --- a/examples/schedule.rs +++ b/examples/schedule.rs @@ -5,14 +5,15 @@ #![no_main] #![no_std] -use cortex_m::peripheral::DWT; -use cortex_m_semihosting::hprintln; use panic_halt as _; -use rtic::cyccnt::{Instant, U32Ext as _}; // NOTE: does NOT work on QEMU! #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)] 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 { // Initialize (enable) the monotonic timer (CYCCNT) diff --git a/examples/shared-with-init.rs b/examples/shared-with-init.rs index 85c72761..ec055886 100644 --- a/examples/shared-with-init.rs +++ b/examples/shared-with-init.rs @@ -5,8 +5,6 @@ #![no_main] #![no_std] -use cortex_m_semihosting::debug; -use lm3s6965::Interrupt; use panic_halt as _; use rtic::app; @@ -15,6 +13,8 @@ pub struct MustBeSend; #[app(device = lm3s6965)] mod app { use super::MustBeSend; + use cortex_m_semihosting::debug; + use lm3s6965::Interrupt; #[resources] struct Resources { diff --git a/examples/spawn.rs b/examples/spawn.rs index 041018ab..300b3b3a 100644 --- a/examples/spawn.rs +++ b/examples/spawn.rs @@ -5,11 +5,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + #[init] fn init(_c: init::Context) -> init::LateResources { foo::spawn(1, 2).unwrap(); diff --git a/examples/spawn2.rs b/examples/spawn2.rs index b50a3ee6..070223b8 100644 --- a/examples/spawn2.rs +++ b/examples/spawn2.rs @@ -5,11 +5,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + #[init] fn init(_c: init::Context) -> init::LateResources { foo::spawn(1, 2).unwrap(); diff --git a/examples/static.rs b/examples/static.rs index 9c3110c0..cd46145a 100644 --- a/examples/static.rs +++ b/examples/static.rs @@ -5,20 +5,18 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use heapless::{ - consts::*, - i, - spsc::{Consumer, Producer, Queue}, -}; -use lm3s6965::Interrupt; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { - use crate::U4; - use crate::{Consumer, Producer}; + use cortex_m_semihosting::{debug, hprintln}; + use heapless::{ + consts::*, + i, + spsc::{Consumer, Producer, Queue}, + }; + use lm3s6965::Interrupt; // Late resources #[resources] diff --git a/examples/t-binds.rs b/examples/t-binds.rs index 3ca4c66e..8d52f58a 100644 --- a/examples/t-binds.rs +++ b/examples/t-binds.rs @@ -17,18 +17,18 @@ mod app { // Cortex-M exception #[task(binds = SVCall)] fn foo(c: foo::Context) { - foo_trampoline(c) + crate::foo_trampoline(c) } // LM3S6965 interrupt #[task(binds = UART0)] fn bar(c: bar::Context) { - bar_trampoline(c) + crate::bar_trampoline(c) } } #[allow(dead_code)] -fn foo_trampoline(_: foo::Context) {} +fn foo_trampoline(_: app::foo::Context) {} #[allow(dead_code)] -fn bar_trampoline(_: bar::Context) {} +fn bar_trampoline(_: app::bar::Context) {} diff --git a/examples/t-htask-main.rs b/examples/t-htask-main.rs index 1e38e317..57076eca 100644 --- a/examples/t-htask-main.rs +++ b/examples/t-htask-main.rs @@ -3,11 +3,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::debug; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::debug; + #[init] fn init(_: init::Context) -> init::LateResources { rtic::pend(lm3s6965::Interrupt::UART0); diff --git a/examples/t-idle-main.rs b/examples/t-idle-main.rs index 9078628e..42dac904 100644 --- a/examples/t-idle-main.rs +++ b/examples/t-idle-main.rs @@ -3,11 +3,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::debug; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::debug; + #[init] fn init(_: init::Context) -> init::LateResources { init::LateResources {} diff --git a/examples/t-init-main.rs b/examples/t-init-main.rs index 7c23cc83..0456e874 100644 --- a/examples/t-init-main.rs +++ b/examples/t-init-main.rs @@ -3,11 +3,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::debug; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::debug; + #[init] fn init(_: init::Context) -> init::LateResources { debug::exit(debug::EXIT_SUCCESS); diff --git a/examples/t-late-not-send.rs b/examples/t-late-not-send.rs index 345d9aef..8b7b986f 100644 --- a/examples/t-late-not-send.rs +++ b/examples/t-late-not-send.rs @@ -14,6 +14,7 @@ pub struct NotSend { #[rtic::app(device = lm3s6965)] mod app { use super::NotSend; + use core::marker::PhantomData; #[resources] struct Resources { diff --git a/examples/t-schedule.rs b/examples/t-schedule.rs index 7c2c420c..b1faaa6d 100644 --- a/examples/t-schedule.rs +++ b/examples/t-schedule.rs @@ -6,10 +6,11 @@ #![no_std] use panic_halt as _; -use rtic::cyccnt::{Instant, U32Ext as _}; #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)] mod app { + use rtic::cyccnt::{Instant, U32Ext as _}; + #[init] fn init(c: init::Context) -> init::LateResources { let _: Result<(), ()> = foo::schedule(c.start + 10.cycles()); diff --git a/examples/t-stask-main.rs b/examples/t-stask-main.rs index 3337c7d3..56dc1af5 100644 --- a/examples/t-stask-main.rs +++ b/examples/t-stask-main.rs @@ -3,11 +3,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::debug; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::debug; + #[init] fn init(_: init::Context) -> init::LateResources { taskmain::spawn().ok(); diff --git a/examples/task-local-minimal.rs b/examples/task-local-minimal.rs index fd5ac68a..6e25c10d 100644 --- a/examples/task-local-minimal.rs +++ b/examples/task-local-minimal.rs @@ -4,11 +4,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + #[resources] struct Resources { // A local (move), late resource diff --git a/examples/task-local.rs b/examples/task-local.rs index 8f0dfc79..462a0d31 100644 --- a/examples/task-local.rs +++ b/examples/task-local.rs @@ -5,12 +5,13 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; -use lm3s6965::Interrupt; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + use lm3s6965::Interrupt; + #[resources] struct Resources { // An early resource diff --git a/examples/task.rs b/examples/task.rs index f3d916f3..60591b9f 100644 --- a/examples/task.rs +++ b/examples/task.rs @@ -5,11 +5,12 @@ #![no_main] #![no_std] -use cortex_m_semihosting::{debug, hprintln}; use panic_semihosting as _; #[rtic::app(device = lm3s6965)] mod app { + use cortex_m_semihosting::{debug, hprintln}; + #[init] fn init(_: init::Context) -> init::LateResources { foo::spawn().unwrap(); diff --git a/examples/types.rs b/examples/types.rs index b55a98c6..815d309a 100644 --- a/examples/types.rs +++ b/examples/types.rs @@ -5,12 +5,13 @@ #![no_main] #![no_std] -use cortex_m_semihosting::debug; use panic_semihosting as _; -use rtic::cyccnt; #[rtic::app(device = lm3s6965, peripherals = true, monotonic = rtic::cyccnt::CYCCNT)] mod app { + use cortex_m_semihosting::debug; + use rtic::cyccnt; + #[resources] struct Resources { #[init(0)] |