add example of using async from an interrupt triggered task

This commit is contained in:
Jorge Aparicio 2018-05-01 15:33:01 +02:00
parent 9058a655dc
commit 20c5e277f7
12 changed files with 168 additions and 16 deletions

View file

@ -25,6 +25,14 @@ name = "empty"
[[example]] [[example]]
name = "interrupt" name = "interrupt"
[[example]]
name = "interrupt-async"
required-features = ["timer-queue"]
[[example]]
name = "interrupt-async-after"
required-features = ["timer-queue"]
[[example]] [[example]]
name = "periodic-payload" name = "periodic-payload"
required-features = ["timer-queue"] required-features = ["timer-queue"]

View file

@ -1,4 +1,3 @@
#![allow(warnings)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![deny(warnings)] #![deny(warnings)]
#![feature(proc_macro)] #![feature(proc_macro)]

View file

@ -1,4 +1,3 @@
#![allow(warnings)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![deny(warnings)] #![deny(warnings)]
#![feature(proc_macro)] #![feature(proc_macro)]

View file

@ -1,4 +1,3 @@
#![allow(warnings)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![deny(warnings)] #![deny(warnings)]
#![feature(proc_macro)] #![feature(proc_macro)]

View file

@ -0,0 +1,74 @@
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
#[macro_use]
extern crate cortex_m;
extern crate cortex_m_rtfm as rtfm;
extern crate panic_abort;
extern crate stm32f103xx;
use cortex_m::asm;
use cortex_m::peripheral::{DWT, ITM};
use rtfm::app;
app! {
device: stm32f103xx,
resources: {
static ITM: ITM;
},
free_interrupts: [EXTI1],
tasks: {
exti0: {
interrupt: EXTI0,
async_after: [a],
resources: [ITM],
},
a: {
resources: [ITM],
},
},
}
const S: u32 = 8_000_000;
#[inline(always)]
fn init(ctxt: init::Context) -> init::LateResources {
unsafe { rtfm::set_pending(stm32f103xx::Interrupt::EXTI0) }
init::LateResources { ITM: ctxt.core.ITM }
}
#[inline(always)]
fn idle(_ctxt: idle::Context) -> ! {
loop {
asm::wfi();
}
}
fn exti0(mut ctxt: exti0::Context) {
let now = DWT::get_cycle_count();
iprintln!(
&mut ctxt.resources.ITM.stim[0],
"exti0(bl={}, now={})",
ctxt.baseline,
now
);
let t = &mut ctxt.threshold;
ctxt.async.a.post(t, 1 * S, ()).ok();
}
fn a(ctxt: a::Context) {
let now = DWT::get_cycle_count();
iprintln!(
&mut ctxt.resources.ITM.stim[0],
"a(bl={}, now={})",
ctxt.baseline,
now
);
}

View file

@ -0,0 +1,72 @@
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
#[macro_use]
extern crate cortex_m;
extern crate cortex_m_rtfm as rtfm;
extern crate panic_abort;
extern crate stm32f103xx;
use cortex_m::asm;
use cortex_m::peripheral::{DWT, ITM};
use rtfm::app;
app! {
device: stm32f103xx,
resources: {
static ITM: ITM;
},
free_interrupts: [EXTI1],
tasks: {
exti0: {
interrupt: EXTI0,
async: [a],
resources: [ITM],
},
a: {
resources: [ITM],
},
},
}
#[inline(always)]
fn init(ctxt: init::Context) -> init::LateResources {
unsafe { rtfm::set_pending(stm32f103xx::Interrupt::EXTI0) }
init::LateResources { ITM: ctxt.core.ITM }
}
#[inline(always)]
fn idle(_ctxt: idle::Context) -> ! {
loop {
asm::wfi();
}
}
fn exti0(mut ctxt: exti0::Context) {
let now = DWT::get_cycle_count();
iprintln!(
&mut ctxt.resources.ITM.stim[0],
"exti0(bl={}, now={})",
ctxt.baseline,
now
);
let t = &mut ctxt.threshold;
ctxt.async.a.post(t, ()).ok();
}
fn a(ctxt: a::Context) {
let now = DWT::get_cycle_count();
iprintln!(
&mut ctxt.resources.ITM.stim[0],
"a(bl={}, now={})",
ctxt.baseline,
now
);
}

View file

@ -1,4 +1,3 @@
#![allow(warnings)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![deny(warnings)] #![deny(warnings)]
#![feature(proc_macro)] #![feature(proc_macro)]

View file

@ -10,7 +10,6 @@
// a(bl=16000000, now=16000168, input=1) // a(bl=16000000, now=16000168, input=1)
// a(bl=24000000, now=24000168, input=2) // a(bl=24000000, now=24000168, input=2)
#![allow(warnings)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![deny(warnings)] #![deny(warnings)]
#![feature(proc_macro)] #![feature(proc_macro)]

View file

@ -23,7 +23,6 @@
// b(bl=96000000, now=96000259, input=3) // b(bl=96000000, now=96000259, input=3)
// a(bl=96000000, now=96002397, input=5) // a(bl=96000000, now=96002397, input=5)
#![allow(warnings)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![deny(warnings)] #![deny(warnings)]
#![feature(proc_macro)] #![feature(proc_macro)]

View file

@ -24,7 +24,6 @@
// b(bl=96000000, now=96000257) // b(bl=96000000, now=96000257)
// a(bl=96000000, now=96001705) // a(bl=96000000, now=96001705)
#![allow(warnings)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![deny(warnings)] #![deny(warnings)]
#![feature(proc_macro)] #![feature(proc_macro)]
@ -33,8 +32,7 @@
#[macro_use] #[macro_use]
extern crate cortex_m; extern crate cortex_m;
extern crate cortex_m_rtfm as rtfm; extern crate cortex_m_rtfm as rtfm;
// extern crate panic_abort; extern crate panic_abort;
extern crate panic_itm;
extern crate stm32f103xx; extern crate stm32f103xx;
use cortex_m::asm; use cortex_m::asm;

View file

@ -7,7 +7,6 @@
// a(bl=8000000, now=8000168) // a(bl=8000000, now=8000168)
// a(bl=16000000, now=16000168) // a(bl=16000000, now=16000168)
#![allow(warnings)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![deny(warnings)] #![deny(warnings)]
#![feature(proc_macro)] #![feature(proc_macro)]

View file

@ -335,6 +335,7 @@ pub fn app(ctxt: &Context, app: &App) -> Tokens {
let task = &app.tasks[name]; let task = &app.tasks[name];
let priority = task.priority; let priority = task.priority;
let __priority = Ident::from(format!("__{}", priority)); let __priority = Ident::from(format!("__{}", priority));
let interrupt = ctxt.dispatchers[&priority].interrupt();
let ty = &task.input; let ty = &task.input;
let sqc = Ident::from(format!( let sqc = Ident::from(format!(
@ -370,8 +371,8 @@ pub fn app(ctxt: &Context, app: &App) -> Tokens {
#krate::Maximum<P, #krate::#qc>: #krate::Unsigned, #krate::Maximum<P, #krate::#qc>: #krate::Unsigned,
{ {
unsafe { unsafe {
if let Some(slot) = let slot = ::#name::SQ::new().claim_mut(t, |sq, _| sq.dequeue());
::#name::SQ::new().claim_mut(t, |sq, _| sq.dequeue()) { if let Some(slot) = slot {
let tp = slot let tp = slot
.write(self.baseline, payload) .write(self.baseline, payload)
.tag(::#__priority::Task::#name); .tag(::#__priority::Task::#name);
@ -380,6 +381,8 @@ pub fn app(ctxt: &Context, app: &App) -> Tokens {
q.split().0.enqueue_unchecked(tp); q.split().0.enqueue_unchecked(tp);
}); });
#krate::set_pending(#device::Interrupt::#interrupt);
Ok(()) Ok(())
} else { } else {
Err(payload) Err(payload)
@ -424,6 +427,8 @@ pub fn app(ctxt: &Context, app: &App) -> Tokens {
q.split().0.enqueue_unchecked(tp); q.split().0.enqueue_unchecked(tp);
}); });
#krate::set_pending(#device::Interrupt::#interrupt);
Ok(()) Ok(())
} else { } else {
Err(payload) Err(payload)
@ -750,10 +755,12 @@ pub fn app(ctxt: &Context, app: &App) -> Tokens {
let async_exprs = app.init let async_exprs = app.init
.async .async
.iter() .iter()
.map(|task| if cfg!(feature = "timer-queue") { .map(|task| {
if cfg!(feature = "timer-queue") {
quote!(#task: ::__async::#task::new(_bl)) quote!(#task: ::__async::#task::new(_bl))
} else { } else {
quote!(#task: ::__async::#task::new()) quote!(#task: ::__async::#task::new())
}
}) })
.chain( .chain(
app.init app.init