mirror of
https://github.com/rtic-rs/rtic.git
synced 2025-12-16 21:05:35 +01:00
implement the Resource trait for owned resources
this unbreaks the "generics" example
This commit is contained in:
parent
219e172680
commit
a6dd004113
11 changed files with 283 additions and 225 deletions
50
examples/custom-type.rs
Normal file
50
examples/custom-type.rs
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
#![deny(unsafe_code)]
|
||||
#![deny(warnings)]
|
||||
#![feature(proc_macro)]
|
||||
#![no_std]
|
||||
|
||||
extern crate cortex_m_rtfm as rtfm;
|
||||
extern crate stm32f103xx;
|
||||
|
||||
use rtfm::{app, Threshold};
|
||||
|
||||
pub struct Foo;
|
||||
|
||||
app! {
|
||||
device: stm32f103xx,
|
||||
|
||||
resources: {
|
||||
static CO_OWNED: Foo = Foo;
|
||||
static ON: Foo = Foo;
|
||||
static OWNED: Foo = Foo;
|
||||
static SHARED: Foo = Foo;
|
||||
},
|
||||
|
||||
idle: {
|
||||
resources: [OWNED, SHARED],
|
||||
},
|
||||
|
||||
tasks: {
|
||||
SYS_TICK: {
|
||||
path: sys_tick,
|
||||
resources: [CO_OWNED, ON, SHARED],
|
||||
},
|
||||
|
||||
TIM2: {
|
||||
enabled: false,
|
||||
path: tim2,
|
||||
priority: 1,
|
||||
resources: [CO_OWNED],
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
fn init(_p: ::init::Peripherals, _r: ::init::Resources) {}
|
||||
|
||||
fn idle(_t: &mut Threshold, _r: ::idle::Resources) -> ! {
|
||||
loop {}
|
||||
}
|
||||
|
||||
fn sys_tick(_t: &mut Threshold, _r: SYS_TICK::Resources) {}
|
||||
|
||||
fn tim2(_t: &mut Threshold, _r: TIM2::Resources) {}
|
||||
|
|
@ -73,12 +73,12 @@ mod main {
|
|||
}
|
||||
}
|
||||
|
||||
fn sys_tick(_t: &mut Threshold, r: SYS_TICK::Resources) {
|
||||
fn sys_tick(_t: &mut Threshold, mut r: SYS_TICK::Resources) {
|
||||
*r.ON = !*r.ON;
|
||||
|
||||
*r.CO_OWNED += 1;
|
||||
}
|
||||
|
||||
fn tim2(_t: &mut Threshold, r: TIM2::Resources) {
|
||||
fn tim2(_t: &mut Threshold, mut r: TIM2::Resources) {
|
||||
*r.CO_OWNED += 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,5 +70,5 @@ fn exti0(t: &mut Threshold, r: EXTI0::Resources) {
|
|||
|
||||
// This task has direct access to the resources
|
||||
fn exti1(t: &mut Threshold, r: EXTI1::Resources) {
|
||||
work(t, r.GPIOA, r.SPI1);
|
||||
work(t, &r.GPIOA, &r.SPI1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
//! Demonstrates initialization of resources in `init`.
|
||||
|
||||
#![deny(unsafe_code)]
|
||||
#![deny(warnings)]
|
||||
#![feature(proc_macro)]
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ fn idle() -> ! {
|
|||
// `r` is the set of resources this task has access to. `SYS_TICK::Resources`
|
||||
// has one field per resource declared in `app!`.
|
||||
#[allow(unsafe_code)]
|
||||
fn sys_tick(_t: &mut Threshold, r: SYS_TICK::Resources) {
|
||||
fn sys_tick(_t: &mut Threshold, mut r: SYS_TICK::Resources) {
|
||||
// toggle state
|
||||
*r.ON = !*r.ON;
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ fn idle() -> ! {
|
|||
}
|
||||
}
|
||||
|
||||
fn sys_tick(_t: &mut Threshold, r: SYS_TICK::Resources) {
|
||||
fn sys_tick(_t: &mut Threshold, mut r: SYS_TICK::Resources) {
|
||||
// ..
|
||||
|
||||
// This task can't be preempted by `tim2` so it has direct access to the
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ fn idle() -> ! {
|
|||
|
||||
// As both tasks are running at the same priority one can't preempt the other.
|
||||
// Thus both tasks have direct access to the resource
|
||||
fn sys_tick(_t: &mut Threshold, r: SYS_TICK::Resources) {
|
||||
fn sys_tick(_t: &mut Threshold, mut r: SYS_TICK::Resources) {
|
||||
// ..
|
||||
|
||||
*r.COUNTER += 1;
|
||||
|
|
@ -50,7 +50,7 @@ fn sys_tick(_t: &mut Threshold, r: SYS_TICK::Resources) {
|
|||
// ..
|
||||
}
|
||||
|
||||
fn tim2(_t: &mut Threshold, r: TIM2::Resources) {
|
||||
fn tim2(_t: &mut Threshold, mut r: TIM2::Resources) {
|
||||
// ..
|
||||
|
||||
*r.COUNTER += 1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue