mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-12-24 19:09:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Detect if the rt flag is defined in the PAC/HAL

Browse source 
Better error message

Improved error string

Update UI tests
This commit is contained in:
Emil Fresk 2020-10-14 20:27:43 +02:00
parent 1db5faad62
commit 48abc26e85
6 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
macros/src/codegen.rs
View file

@ -144,7 +144,7 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
/// Implementation details /// Implementation details
mod #name { mod #name {
/// Always include the device crate which contains the vector table /// Always include the device crate which contains the vector table
use #device as _; use #device as you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml;
#(#imports)* #(#imports)*
#(#user_imports)* #(#user_imports)*

4
macros/src/codegen/pre_init.rs
View file

@ -53,14 +53,14 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
let interrupt = util::interrupt_ident(); let interrupt = util::interrupt_ident();
stmts.push(quote!( stmts.push(quote!(
core.NVIC.set_priority( core.NVIC.set_priority(
#device::#interrupt::#name, you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml::#interrupt::#name,
rtic::export::logical2hw(#priority, #nvic_prio_bits), rtic::export::logical2hw(#priority, #nvic_prio_bits),
); );
)); ));
// NOTE unmask the interrupt *after* setting its priority: changing the priority of a pended // NOTE unmask the interrupt *after* setting its priority: changing the priority of a pended
// interrupt is implementation defined // interrupt is implementation defined
stmts.push(quote!(rtic::export::NVIC::unmask(#device::#interrupt::#name);)); stmts.push(quote!(rtic::export::NVIC::unmask(you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml::#interrupt::#name);));
} }
// Set exception priorities // Set exception priorities

5
macros/src/codegen/spawn_body.rs
View file

@ -10,7 +10,7 @@ pub fn codegen(
name: &Ident, name: &Ident,
app: &App, app: &App,
analysis: &Analysis, analysis: &Analysis,
extra: &Extra, _extra: &Extra,
) -> TokenStream2 { ) -> TokenStream2 {
let spawnee = &app.software_tasks[name]; let spawnee = &app.software_tasks[name];
let priority = spawnee.args.priority; let priority = spawnee.args.priority;
@ -42,12 +42,11 @@ pub fn codegen(
) )
}; };
let device = extra.device;
let enum_ = util::interrupt_ident(); let enum_ = util::interrupt_ident();
let interrupt = &analysis.interrupts.get(&priority); let interrupt = &analysis.interrupts.get(&priority);
let pend = { let pend = {
quote!( quote!(
rtic::pend(#device::#enum_::#interrupt); rtic::pend(you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml::#enum_::#interrupt);
) )
}; };

3
macros/src/codegen/timer_queue.rs
View file

@ -72,7 +72,6 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
// Timer queue handler // Timer queue handler
{ {
let device = extra.device;
let arms = timer_queue let arms = timer_queue
.tasks .tasks
.iter() .iter()
@ -88,7 +87,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
let pend = { let pend = {
quote!( quote!(
rtic::pend(#device::#enum_::#interrupt); rtic::pend(you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml::#enum_::#interrupt);
) )
}; };

2
macros/src/codegen/util.rs
View file

@ -83,7 +83,7 @@ pub fn instants_ident(task: &Ident) -> Ident {
pub fn interrupt_ident() -> Ident { pub fn interrupt_ident() -> Ident {
let span = Span::call_site(); let span = Span::call_site();
Ident::new("Interrupt", span) Ident::new("interrupt", span)
} }
/// Whether `name` is an exception with configurable priority /// Whether `name` is an exception with configurable priority

6
ui/single/locals-cfg.stderr
View file

@ -33,9 +33,3 @@ error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `p
= note: the lang item is first defined in crate `std` (which `$CRATE` depends on) = note: the lang item is first defined in crate `std` (which `$CRATE` depends on)
= note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-f14aca24435a5414.rlib = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-f14aca24435a5414.rlib
= note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-33949299fdfa2375.rmeta = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-33949299fdfa2375.rmeta
error: duplicate lang item in crate `panic_semihosting`: `panic_impl`.
|
= note: the lang item is first defined in crate `panic_halt` (which `$CRATE` depends on)
= note: first definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-33949299fdfa2375.rmeta
= note: second definition in `panic_semihosting` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_semihosting-f97442f9ee5cfc78.rmeta