aboutsummaryrefslogtreecommitdiff
path: root/macros/src/codegen/idle.rs
diff options
context:
space:
mode:
Diffstat (limited to 'macros/src/codegen/idle.rs')
-rw-r--r--macros/src/codegen/idle.rs25
1 files changed, 22 insertions, 3 deletions
diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs
index d0bff3e7..db454a58 100644
--- a/macros/src/codegen/idle.rs
+++ b/macros/src/codegen/idle.rs
@@ -1,5 +1,5 @@
use proc_macro2::TokenStream as TokenStream2;
-use quote::quote;
+use quote::{quote, format_ident};
use rtic_syntax::{ast::App, Context};
use crate::{
@@ -23,6 +23,8 @@ pub fn codegen(
Vec<TokenStream2>,
// user_idle
Option<TokenStream2>,
+ // user_idle_imports
+ Vec<TokenStream2>,
// call_idle
TokenStream2,
) {
@@ -34,15 +36,25 @@ pub fn codegen(
let mut locals_pat = None;
let mut locals_new = None;
+ let mut user_idle_imports = vec![];
+
+ let name = &idle.name;
+
if !idle.args.resources.is_empty() {
let (item, constructor) =
resources_struct::codegen(Context::Idle, 0, &mut needs_lt, app, analysis);
root_idle.push(item);
const_app = Some(constructor);
+
+ let name_resource = format_ident!("{}Resources", name);
+ user_idle_imports.push(quote!(
+ #[allow(non_snake_case)]
+ use super::#name_resource;
+ ));
+
}
- let name = &idle.name;
if !idle.locals.is_empty() {
let (locals, pat) = locals::codegen(Context::Idle, &idle.locals, app);
@@ -66,6 +78,12 @@ pub fn codegen(
#(#stmts)*
}
));
+ user_idle_imports.push(quote!(
+ #(#attrs)*
+ #[allow(non_snake_case)]
+ #cfg_core
+ use super::#name;
+ ));
let locals_new = locals_new.iter();
let call_idle = quote!(crate::#name(
@@ -73,12 +91,13 @@ pub fn codegen(
#name::Context::new(&rtic::export::Priority::new(0))
));
- (const_app, root_idle, user_idle, call_idle)
+ (const_app, root_idle, user_idle, user_idle_imports, call_idle)
} else {
(
None,
vec![],
None,
+ vec![],
quote!(loop {
rtic::export::wfi()
}),