diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2021-05-27 16:18:46 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-05-27 16:18:46 +0000 |
| commit | 0b0bb1bfa9de42e951f538b8f43bfcc53709a241 (patch) | |
| tree | 8d83566481df0925920b703e63dc310b87c39bb9 /macros/src/codegen/pre_init.rs | |
| parent | aad8f81991c3495f225df80d7c8456faecd40728 (diff) | |
| parent | c17348d2904b60713e1914567ba5566134165103 (diff) | |
| download | rtic-0b0bb1bfa9de42e951f538b8f43bfcc53709a241.tar.gz rtic-0b0bb1bfa9de42e951f538b8f43bfcc53709a241.tar.zst rtic-0b0bb1bfa9de42e951f538b8f43bfcc53709a241.zip | |
Merge #485v0.6.0-alpha.4
485: New codegen structure to eliminate issues with paths r=korken89 a=korken89
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
Diffstat (limited to 'macros/src/codegen/pre_init.rs')
| -rw-r--r-- | macros/src/codegen/pre_init.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs index 3a62da50..531debac 100644 --- a/macros/src/codegen/pre_init.rs +++ b/macros/src/codegen/pre_init.rs @@ -93,8 +93,6 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream // Compile time assert that this priority is supported by the device stmts.push(quote!(let _ = [(); ((1 << #nvic_prio_bits) - #priority as usize)];)); - let app_name = &app.name; - let app_path = quote! {crate::#app_name}; let mono_type = &monotonic.ty; if &*binds.to_string() == "SysTick" { @@ -121,7 +119,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream // Always enable monotonic interrupts if they should never be off if !<#mono_type as rtic::Monotonic>::DISABLE_INTERRUPT_ON_EMPTY_QUEUE { - rtic::export::NVIC::unmask(#app_path::#rt_err::#interrupt::#binds); + rtic::export::NVIC::unmask(#rt_err::#interrupt::#binds); } )); } |