diff options
| author |  Emil Fresk <emil.fresk@gmail.com>
| 2020-10-15 17:55:00 +0200 |
|---|---|---|
| committer | Emil Fresk <emil.fresk@gmail.com>
| 2020-10-15 17:55:00 +0200 |
| commit | 5ac16f6aae7c4760711b1eef5cbaf1c57c5933ca (patch) | |
| tree | ad2e1b0ac81f3ffebe73edcf62b8cc4472eaff13 /macros/src/codegen | |
| parent | 5b8e6a22ab68e316e11641dedf5b39e20878c7b7 (diff) | |
| parent | ee0885063d5b1cc4eddd3918ff425796f6213464 (diff) | |
| download | rtic-5ac16f6aae7c4760711b1eef5cbaf1c57c5933ca.tar.gz rtic-5ac16f6aae7c4760711b1eef5cbaf1c57c5933ca.tar.zst rtic-5ac16f6aae7c4760711b1eef5cbaf1c57c5933ca.zip | |
Merge branch 'master' into spawn_experiment
Diffstat (limited to 'macros/src/codegen')
| -rw-r--r-- | macros/src/codegen/pre_init.rs | 4 | ||||
| -rw-r--r-- | macros/src/codegen/timer_queue.rs | 3 | ||||
| -rw-r--r-- | macros/src/codegen/util.rs | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs index 02afdf95..17c9c2f4 100644 --- a/macros/src/codegen/pre_init.rs +++ b/macros/src/codegen/pre_init.rs @@ -49,14 +49,14 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream let interrupt = util::interrupt_ident(); stmts.push(quote!( 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), ); )); // NOTE unmask the interrupt *after* setting its priority: changing the priority of a pended // 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 diff --git a/macros/src/codegen/timer_queue.rs b/macros/src/codegen/timer_queue.rs index ae864364..c898a7fd 100644 --- a/macros/src/codegen/timer_queue.rs +++ b/macros/src/codegen/timer_queue.rs @@ -62,7 +62,6 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream // Timer queue handler { - let device = extra.device; let arms = app .software_tasks .iter() @@ -76,7 +75,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream let pend = { quote!( - rtic::pend(#device::#enum_::#interrupt); + rtic::pend(you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml::#enum_::#interrupt); ) }; diff --git a/macros/src/codegen/util.rs b/macros/src/codegen/util.rs index 64da0096..f04ccb23 100644 --- a/macros/src/codegen/util.rs +++ b/macros/src/codegen/util.rs @@ -83,7 +83,7 @@ pub fn instants_ident(task: &Ident) -> Ident { pub fn interrupt_ident() -> Ident { let span = Span::call_site(); - Ident::new("Interrupt", span) + Ident::new("interrupt", span) } /// Whether `name` is an exception with configurable priority |