From 46bf583cc21bd8fa34e3163149b4327fcc08057e Mon Sep 17 00:00:00 2001
From: Henrik Tjäder <henrik@tjaders.com>
Date: Tue, 19 May 2020 19:03:19 +0000
Subject: Handle user hardware and software tasks and some resources

---
 macros/src/codegen/software_tasks.rs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'macros/src/codegen/software_tasks.rs')

diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs
index b56db419..07edd1db 100644
--- a/macros/src/codegen/software_tasks.rs
+++ b/macros/src/codegen/software_tasks.rs
@@ -22,10 +22,13 @@ pub fn codegen(
     Vec<TokenStream2>,
     // user_software_tasks -- the `#[task]` functions written by the user
     Vec<TokenStream2>,
+    // user_software_tasks_imports -- the imports for `#[task]` functions written by the user
+    Vec<TokenStream2>,
 ) {
     let mut const_app = vec![];
     let mut root = vec![];
     let mut user_tasks = vec![];
+    let mut software_tasks_imports = vec![];
 
     for (name, task) in &app.software_tasks {
         let inputs = &task.inputs;
@@ -112,6 +115,13 @@ pub fn codegen(
                 analysis,
             );
 
+            // Add resources to imports
+            let name_res = format_ident!("{}Resources", name);
+            software_tasks_imports.push(quote!(
+                #[allow(non_snake_case)]
+                use super::#name_res;
+            ));
+
             root.push(item);
 
             const_app.push(constructor);
@@ -141,6 +151,12 @@ pub fn codegen(
                 #(#stmts)*
             }
         ));
+        software_tasks_imports.push(quote!(
+            #(#attrs)*
+            #(#cfgs)*
+            #[allow(non_snake_case)]
+            use super::#name;
+        ));
 
         root.push(module::codegen(
             Context::SoftwareTask(name),
@@ -150,5 +166,5 @@ pub fn codegen(
         ));
     }
 
-    (const_app, root, user_tasks)
+    (const_app, root, user_tasks, software_tasks_imports)
 }
-- 
cgit v1.2.3