mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-27 14:04:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Test fixes

Browse source
This commit is contained in:
Emil Fresk 2021-02-20 19:22:45 +01:00
parent d02f9a0241
commit 555f36857e
50 changed files with 121 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -18,10 +18,6 @@ version = "0.6.0-alpha.0"
[lib] [lib]
name = "rtic" name = "rtic"
[[example]]
name = "baseline"
required-features = ["__v7"]
[[example]] [[example]]
name = "periodic" name = "periodic"
required-features = ["__v7"] required-features = ["__v7"]

50
examples/baseline.rs
View file

@ -1,50 +0,0 @@
//! examples/baseline.rs
#![deny(unsafe_code)]
#![deny(warnings)]
#![no_main]
#![no_std]
use panic_semihosting as _;
// NOTE: does NOT properly work on QEMU
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT, dispatchers = [SSI0])]
mod app {
use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
#[init]
fn init(cx: init::Context) -> init::LateResources {
// omitted: initialization of `CYCCNT`
hprintln!("init(baseline = {:?})", cx.start).unwrap();
// `foo` inherits the baseline of `init`: `Instant(0)`
foo::spawn().unwrap();
init::LateResources {}
}
#[task]
fn foo(cx: foo::Context) {
static mut ONCE: bool = true;
hprintln!("foo(baseline = {:?})", cx.scheduled).unwrap();
if *ONCE {
*ONCE = false;
rtic::pend(Interrupt::UART0);
} else {
debug::exit(debug::EXIT_SUCCESS);
}
}
#[task(binds = UART0)]
fn uart0(cx: uart0::Context) {
hprintln!("UART0(baseline = {:?})", cx.start).unwrap();
// `foo` inherits the baseline of `UART0`: its `start` time
foo::spawn().unwrap();
}
}

13
examples/big-struct-opt.rs
View file

@ -31,7 +31,7 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
let big_struct = unsafe { let big_struct = unsafe {
static mut BIG_STRUCT: MaybeUninit<BigStruct> = MaybeUninit::uninit(); static mut BIG_STRUCT: MaybeUninit<BigStruct> = MaybeUninit::uninit();
@ -40,9 +40,12 @@ mod app {
&mut *BIG_STRUCT.as_mut_ptr() &mut *BIG_STRUCT.as_mut_ptr()
}; };
init::LateResources { (
// assign the reference so we can use the resource init::LateResources {
big_struct, // assign the reference so we can use the resource
} big_struct,
},
init::Monotonics(),
)
} }
} }

4
examples/binds.rs
View file

@ -14,12 +14,12 @@ mod app {
use lm3s6965::Interrupt; use lm3s6965::Interrupt;
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART0);
hprintln!("init").unwrap(); hprintln!("init").unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle] #[idle]

4
examples/capacity.rs
View file

@ -13,10 +13,10 @@ mod app {
use lm3s6965::Interrupt; use lm3s6965::Interrupt;
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART0);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task(binds = UART0)] #[task(binds = UART0)]

4
examples/cfg-whole-task.rs
View file

@ -24,11 +24,11 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
foo::spawn().unwrap(); foo::spawn().unwrap();
foo::spawn().unwrap(); foo::spawn().unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle] #[idle]

4
examples/cfg.rs
View file

@ -21,11 +21,11 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
foo::spawn().unwrap(); foo::spawn().unwrap();
foo::spawn().unwrap(); foo::spawn().unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle] #[idle]

4
examples/destructure.rs
View file

@ -24,11 +24,11 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART1); rtic::pend(Interrupt::UART1);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
// Direct destructure // Direct destructure

13
examples/double_schedule.rs
View file

@ -7,20 +7,13 @@
use panic_semihosting as _; use panic_semihosting as _;
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT, dispatchers = [SSI0])] #[rtic::app(device = lm3s6965, dispatchers = [SSI0])]
mod app { mod app {
use rtic::cyccnt::U32Ext;
#[resources]
struct Resources {
nothing: (),
}
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
task1::spawn().ok(); task1::spawn().ok();
init::LateResources { nothing: () } (init::LateResources {}, init::Monotonics())
} }
#[task] #[task]

4
examples/extern_binds.rs
View file

@ -20,12 +20,12 @@ mod app {
use lm3s6965::Interrupt; use lm3s6965::Interrupt;
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART0);
hprintln!("init").unwrap(); hprintln!("init").unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle] #[idle]

4
examples/extern_spawn.rs
View file

@ -22,10 +22,10 @@ mod app {
use crate::foo; use crate::foo;
#[init] #[init]
fn init(_c: init::Context) -> init::LateResources { fn init(_c: init::Context) -> (init::LateResources, init::Monotonics) {
foo::spawn(1, 2).unwrap(); foo::spawn(1, 2).unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
extern "Rust" { extern "Rust" {

4
examples/generics.rs
View file

@ -21,11 +21,11 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART1); rtic::pend(Interrupt::UART1);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task(binds = UART0, resources = [shared])] #[task(binds = UART0, resources = [shared])]

4
examples/hardware.rs
View file

@ -13,14 +13,14 @@ mod app {
use lm3s6965::Interrupt; use lm3s6965::Interrupt;
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
// Pends the UART0 interrupt but its handler won't run until *after* // Pends the UART0 interrupt but its handler won't run until *after*
// `init` returns because interrupts are disabled // `init` returns because interrupts are disabled
rtic::pend(Interrupt::UART0); // equivalent to NVIC::pend rtic::pend(Interrupt::UART0); // equivalent to NVIC::pend
hprintln!("init").unwrap(); hprintln!("init").unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle] #[idle]

4
examples/idle.rs
View file

@ -12,10 +12,10 @@ mod app {
use cortex_m_semihosting::{debug, hprintln}; use cortex_m_semihosting::{debug, hprintln};
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
hprintln!("init").unwrap(); hprintln!("init").unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle] #[idle]

4
examples/init.rs
View file

@ -12,7 +12,7 @@ mod app {
use cortex_m_semihosting::{debug, hprintln}; use cortex_m_semihosting::{debug, hprintln};
#[init] #[init]
fn init(cx: init::Context) -> init::LateResources { fn init(cx: init::Context) -> (init::LateResources, init::Monotonics) {
static mut X: u32 = 0; static mut X: u32 = 0;
// Cortex-M peripherals // Cortex-M peripherals
@ -32,6 +32,6 @@ mod app {
debug::exit(debug::EXIT_SUCCESS); debug::exit(debug::EXIT_SUCCESS);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
} }

4
examples/late.rs
View file

@ -25,13 +25,13 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
static mut Q: Queue<u32, U4> = Queue(i::Queue::new()); static mut Q: Queue<u32, U4> = Queue(i::Queue::new());
let (p, c) = Q.split(); let (p, c) = Q.split();
// Initialization of late resources // Initialization of late resources
init::LateResources { p, c } (init::LateResources { p, c }, init::Monotonics())
} }
#[idle(resources = [c])] #[idle(resources = [c])]

4
examples/lock.rs
View file

@ -19,10 +19,10 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::GPIOA); rtic::pend(Interrupt::GPIOA);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
// when omitted priority is assumed to be `1` // when omitted priority is assumed to be `1`

4
examples/message.rs
View file

@ -12,10 +12,10 @@ mod app {
use cortex_m_semihosting::{debug, hprintln}; use cortex_m_semihosting::{debug, hprintln};
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
foo::spawn(/* no message */).unwrap(); foo::spawn(/* no message */).unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task] #[task]

4
examples/multilock.rs
View file

@ -25,10 +25,10 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::GPIOA); rtic::pend(Interrupt::GPIOA);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
// when omitted priority is assumed to be `1` // when omitted priority is assumed to be `1`

4
examples/not-sync.rs
View file

@ -25,10 +25,10 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
debug::exit(debug::EXIT_SUCCESS); debug::exit(debug::EXIT_SUCCESS);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task(resources = [&shared])] #[task(resources = [&shared])]

4
examples/only-shared-access.rs
View file

@ -18,11 +18,11 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART1); rtic::pend(Interrupt::UART1);
init::LateResources { key: 0xdeadbeef } (init::LateResources { key: 0xdeadbeef }, init::Monotonics())
} }
#[task(binds = UART0, resources = [&key])] #[task(binds = UART0, resources = [&key])]

6
examples/periodic.rs
View file

@ -8,7 +8,7 @@
use panic_semihosting as _; use panic_semihosting as _;
// NOTE: does NOT work on QEMU! // NOTE: does NOT work on QEMU!
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT, dispatchers = [SSI0])] #[rtic::app(device = lm3s6965, dispatchers = [SSI0])]
mod app { mod app {
use cortex_m_semihosting::hprintln; use cortex_m_semihosting::hprintln;
use rtic::cyccnt::{Instant, U32Ext}; use rtic::cyccnt::{Instant, U32Ext};
@ -16,12 +16,12 @@ mod app {
const PERIOD: u32 = 8_000_000; const PERIOD: u32 = 8_000_000;
#[init] #[init]
fn init(cx: init::Context) -> init::LateResources { fn init(cx: init::Context) -> (init::LateResources, init::Monotonics) {
// omitted: initialization of `CYCCNT` // omitted: initialization of `CYCCNT`
foo::schedule(cx.start + PERIOD.cycles()).unwrap(); foo::schedule(cx.start + PERIOD.cycles()).unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task] #[task]

4
examples/peripherals-taken.rs
View file

@ -10,10 +10,10 @@ mod app {
use cortex_m_semihosting::debug; use cortex_m_semihosting::debug;
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
assert!(cortex_m::Peripherals::take().is_none()); assert!(cortex_m::Peripherals::take().is_none());
debug::exit(debug::EXIT_SUCCESS); debug::exit(debug::EXIT_SUCCESS);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
} }

4
examples/pool.rs
View file

@ -25,7 +25,7 @@ mod app {
use super::P; use super::P;
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
static mut MEMORY: [u8; 512] = [0; 512]; static mut MEMORY: [u8; 512] = [0; 512];
// Increase the capacity of the memory pool by ~4 // Increase the capacity of the memory pool by ~4
@ -33,7 +33,7 @@ mod app {
rtic::pend(Interrupt::I2C0); rtic::pend(Interrupt::I2C0);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task(binds = I2C0, priority = 2)] #[task(binds = I2C0, priority = 2)]

4
examples/preempt.rs
View file

@ -12,10 +12,10 @@ mod app {
use lm3s6965::Interrupt; use lm3s6965::Interrupt;
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::GPIOA); rtic::pend(Interrupt::GPIOA);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task(binds = GPIOA, priority = 1)] #[task(binds = GPIOA, priority = 1)]

4
examples/ramfunc.rs
View file

@ -19,10 +19,10 @@ mod app {
use cortex_m_semihosting::{debug, hprintln}; use cortex_m_semihosting::{debug, hprintln};
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
foo::spawn().unwrap(); foo::spawn().unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[inline(never)] #[inline(never)]

4
examples/resource-user-struct.rs
View file

@ -27,11 +27,11 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART1); rtic::pend(Interrupt::UART1);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
// `shared` cannot be accessed from this context // `shared` cannot be accessed from this context

4
examples/resource.rs
View file

@ -20,11 +20,11 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART1); rtic::pend(Interrupt::UART1);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
// `shared` cannot be accessed from this context // `shared` cannot be accessed from this context

6
examples/schedule.rs
View file

@ -8,14 +8,14 @@
use panic_halt as _; use panic_halt as _;
// NOTE: does NOT work on QEMU! // NOTE: does NOT work on QEMU!
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT, dispatchers = [SSI0])] #[rtic::app(device = lm3s6965, dispatchers = [SSI0])]
mod app { mod app {
use cortex_m::peripheral::DWT; use cortex_m::peripheral::DWT;
use cortex_m_semihosting::hprintln; use cortex_m_semihosting::hprintln;
use rtic::cyccnt::{Instant, U32Ext as _}; use rtic::cyccnt::{Instant, U32Ext as _};
#[init()] #[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) // Initialize (enable) the monotonic timer (CYCCNT)
cx.core.DCB.enable_trace(); cx.core.DCB.enable_trace();
// required on Cortex-M7 devices that software lock the DWT (e.g. STM32F7) // 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 // Schedule `bar` to run 4e6 cycles in the future
bar::schedule(now + 4_000_000.cycles()).unwrap(); bar::schedule(now + 4_000_000.cycles()).unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task] #[task]

4
examples/spawn.rs
View file

@ -12,10 +12,10 @@ mod app {
use cortex_m_semihosting::{debug, hprintln}; use cortex_m_semihosting::{debug, hprintln};
#[init] #[init]
fn init(_c: init::Context) -> init::LateResources { fn init(_c: init::Context) -> (init::LateResources, init::Monotonics) {
foo::spawn(1, 2).unwrap(); foo::spawn(1, 2).unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task()] #[task()]

4
examples/spawn2.rs
View file

@ -12,10 +12,10 @@ mod app {
use cortex_m_semihosting::{debug, hprintln}; use cortex_m_semihosting::{debug, hprintln};
#[init] #[init]
fn init(_c: init::Context) -> init::LateResources { fn init(_c: init::Context) -> (init::LateResources, init::Monotonics) {
foo::spawn(1, 2).unwrap(); foo::spawn(1, 2).unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task] #[task]

4
examples/static.rs
View file

@ -26,13 +26,13 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
static mut Q: Queue<u32, U4> = Queue(i::Queue::new()); static mut Q: Queue<u32, U4> = Queue(i::Queue::new());
let (p, c) = Q.split(); let (p, c) = Q.split();
// Initialization of late resources // Initialization of late resources
init::LateResources { p, c } (init::LateResources { p, c }, init::Monotonics())
} }
#[idle(resources = [c])] #[idle(resources = [c])]

4
examples/t-binds.rs
View file

@ -10,8 +10,8 @@ use panic_halt as _;
#[rtic::app(device = lm3s6965)] #[rtic::app(device = lm3s6965)]
mod app { mod app {
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
// Cortex-M exception // Cortex-M exception

17
examples/t-cfg-resources.rs
View file

@ -18,13 +18,16 @@ mod app {
dummy: (), // dummy such that we have at least one late resource dummy: (), // dummy such that we have at least one late resource
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
init::LateResources { (
// The feature needs to be applied everywhere x is defined or used init::LateResources {
#[cfg(feature = "feature_x")] // The feature needs to be applied everywhere x is defined or used
x: 0, #[cfg(feature = "feature_x")]
dummy: (), // dummy such that we have at least one late resource x: 0,
} dummy: (), // dummy such that we have at least one late resource
},
init::Monotonics(),
)
} }
#[idle] #[idle]

6
examples/t-cfg.rs
View file

@ -5,7 +5,7 @@
use panic_halt as _; use panic_halt as _;
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT, dispatchers = [SSI0, QEI0])] #[rtic::app(device = lm3s6965, dispatchers = [SSI0, QEI0])]
mod app { mod app {
#[resources] #[resources]
struct Resources { struct Resources {
@ -15,11 +15,11 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
#[cfg(never)] #[cfg(never)]
static mut BAR: u32 = 0; static mut BAR: u32 = 0;
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle] #[idle]

4
examples/t-htask-main.rs
View file

@ -10,10 +10,10 @@ mod app {
use cortex_m_semihosting::debug; use cortex_m_semihosting::debug;
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(lm3s6965::Interrupt::UART0); rtic::pend(lm3s6965::Interrupt::UART0);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task(binds = UART0)] #[task(binds = UART0)]

4
examples/t-idle-main.rs
View file

@ -10,8 +10,8 @@ mod app {
use cortex_m_semihosting::debug; use cortex_m_semihosting::debug;
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle] #[idle]

4
examples/t-init-main.rs
View file

@ -10,9 +10,9 @@ mod app {
use cortex_m_semihosting::debug; use cortex_m_semihosting::debug;
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
debug::exit(debug::EXIT_SUCCESS); debug::exit(debug::EXIT_SUCCESS);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
} }

11
examples/t-late-not-send.rs
View file

@ -24,10 +24,13 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
init::LateResources { (
x: NotSend { _0: PhantomData }, init::LateResources {
} x: NotSend { _0: PhantomData },
},
init::Monotonics(),
)
} }
#[idle(resources = [x, y])] #[idle(resources = [x, y])]

4
examples/t-resource.rs
View file

@ -32,8 +32,8 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle(resources = [o2, &o4, s1, &s3])] #[idle(resources = [o2, &o4, s1, &s3])]

8
examples/t-schedule-core-stable.rs
View file

@ -7,13 +7,13 @@
use panic_halt as _; use panic_halt as _;
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT, dispatchers = [SSI0])] #[rtic::app(device = lm3s6965, dispatchers = [SSI0])]
mod app { mod app {
#[init] #[init]
fn init(c: init::Context) -> init::LateResources { fn init(c: init::Context) -> (init::LateResources, init::Monotonics) {
let _c: rtic::Peripherals = c.core; let _c: cortex_m::Peripherals = c.core;
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task] #[task]

6
examples/t-schedule.rs
View file

@ -7,17 +7,17 @@
use panic_halt as _; use panic_halt as _;
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT, dispatchers = [SSI0])] #[rtic::app(device = lm3s6965, dispatchers = [SSI0])]
mod app { mod app {
use rtic::cyccnt::{Instant, U32Ext as _}; use rtic::cyccnt::{Instant, U32Ext as _};
#[init] #[init]
fn init(c: init::Context) -> init::LateResources { fn init(c: init::Context) -> (init::LateResources, init::Monotonics) {
let _: Result<(), ()> = foo::schedule(c.start + 10.cycles()); let _: Result<(), ()> = foo::schedule(c.start + 10.cycles());
let _: Result<(), u32> = bar::schedule(c.start + 20.cycles(), 0); let _: Result<(), u32> = bar::schedule(c.start + 20.cycles(), 0);
let _: Result<(), (u32, u32)> = baz::schedule(c.start + 30.cycles(), 0, 1); let _: Result<(), (u32, u32)> = baz::schedule(c.start + 30.cycles(), 0, 1);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle] #[idle]

4
examples/t-spawn.rs
View file

@ -10,12 +10,12 @@ use panic_halt as _;
#[rtic::app(device = lm3s6965, dispatchers = [SSI0])] #[rtic::app(device = lm3s6965, dispatchers = [SSI0])]
mod app { mod app {
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
let _: Result<(), ()> = foo::spawn(); let _: Result<(), ()> = foo::spawn();
let _: Result<(), u32> = bar::spawn(0); let _: Result<(), u32> = bar::spawn(0);
let _: Result<(), (u32, u32)> = baz::spawn(0, 1); let _: Result<(), (u32, u32)> = baz::spawn(0, 1);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle] #[idle]

4
examples/t-stask-main.rs
View file

@ -10,10 +10,10 @@ mod app {
use cortex_m_semihosting::debug; use cortex_m_semihosting::debug;
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
taskmain::spawn().ok(); taskmain::spawn().ok();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task] #[task]

4
examples/task-local-minimal.rs
View file

@ -18,8 +18,8 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
init::LateResources { l: 42 } (init::LateResources { l: 42 }, init::Monotonics())
} }
// l is task_local // l is task_local

4
examples/task-local.rs
View file

@ -38,10 +38,10 @@ mod app {
} }
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART0);
rtic::pend(Interrupt::UART1); rtic::pend(Interrupt::UART1);
init::LateResources { e2: 2, l2: 2 } (init::LateResources { e2: 2, l2: 2 }, init::Monotonics())
} }
// `shared` cannot be accessed from this context // `shared` cannot be accessed from this context

4
examples/task.rs
View file

@ -12,10 +12,10 @@ mod app {
use cortex_m_semihosting::{debug, hprintln}; use cortex_m_semihosting::{debug, hprintln};
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
foo::spawn().unwrap(); foo::spawn().unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task] #[task]

4
examples/task_named_main.rs
View file

@ -12,10 +12,10 @@ mod app {
use cortex_m_semihosting::{debug, hprintln}; use cortex_m_semihosting::{debug, hprintln};
#[init] #[init]
fn init(_: init::Context) -> init::LateResources { fn init(_: init::Context) -> (init::LateResources, init::Monotonics) {
main::spawn().unwrap(); main::spawn().unwrap();
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[task] #[task]

25
examples/test_new_monotonic.rs
View file

@ -1,25 +0,0 @@
//! examples/test_new_monotonic.rs
#![no_main]
#![no_std]
use panic_semihosting as _; // panic handler
use rtic::app;
#[app(device = lm3s6965, dispatchers = [UART])]
mod app {
#[monotonic(binds = SysTick)]
type MyMono1 = hal::Mono1;
#[monotonic(binds = SomeISR2, default = true)]
type MyMono2 = hal::Mono2;
#[init]
fn init(cx: init::Context) -> (init::LateResources, init::Monotonics) {}
#[task]
fn task1(_: task1::Context) {}
#[task]
fn task2(_: task2::Context) {}
}

7
examples/types.rs
View file

@ -7,10 +7,9 @@
use panic_semihosting as _; use panic_semihosting as _;
#[rtic::app(device = lm3s6965, peripherals = true, monotonic = rtic::cyccnt::CYCCNT, dispatchers = [SSI0])] #[rtic::app(device = lm3s6965, peripherals = true, dispatchers = [SSI0])]
mod app { mod app {
use cortex_m_semihosting::debug; use cortex_m_semihosting::debug;
use rtic::cyccnt;
#[resources] #[resources]
struct Resources { struct Resources {
@ -19,14 +18,14 @@ mod app {
} }
#[init] #[init]
fn init(cx: init::Context) -> init::LateResources { fn init(cx: init::Context) -> (init::LateResources, init::Monotonics) {
let _: cyccnt::Instant = cx.start; let _: cyccnt::Instant = cx.start;
let _: rtic::Peripherals = cx.core; let _: rtic::Peripherals = cx.core;
let _: lm3s6965::Peripherals = cx.device; let _: lm3s6965::Peripherals = cx.device;
debug::exit(debug::EXIT_SUCCESS); debug::exit(debug::EXIT_SUCCESS);
init::LateResources {} (init::LateResources {}, init::Monotonics())
} }
#[idle] #[idle]