From 46bf583cc21bd8fa34e3163149b4327fcc08057e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <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/resources.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/macros/src/codegen/resources.rs b/macros/src/codegen/resources.rs
index 4196ee7..80e63c7 100644
--- a/macros/src/codegen/resources.rs
+++ b/macros/src/codegen/resources.rs
@@ -14,9 +14,12 @@ pub fn codegen(
     Vec<TokenStream2>,
     // mod_resources -- the `resources` module
     TokenStream2,
+    // mod_resources_imports -- the `resources` module imports
+    Vec<TokenStream2>,
 ) {
     let mut const_app = vec![];
     let mut mod_resources = vec![];
+    let mut mod_resources_imports = vec![];
 
     for (name, res, expr, _) in app.resources(analysis) {
         let cfgs = &res.cfgs;
@@ -82,6 +85,13 @@ pub fn codegen(
                 )
             };
 
+            mod_resources_imports.push(quote!(
+                #[allow(non_camel_case_types)]
+                #(#cfgs)*
+                #cfg_core
+                use super::#name;
+            ));
+
             const_app.push(util::impl_mutex(
                 extra,
                 cfgs,
@@ -104,5 +114,5 @@ pub fn codegen(
         })
     };
 
-    (const_app, mod_resources)
+    (const_app, mod_resources, mod_resources_imports)
 }
-- 
cgit v1.2.3


From 9fd052b876581e5aef3442b17c17b0b597f84a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Tue, 26 May 2020 10:52:10 +0000
Subject: Collect and generate required use-statements

---
 macros/src/codegen/resources.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/macros/src/codegen/resources.rs b/macros/src/codegen/resources.rs
index 80e63c7..a326e68 100644
--- a/macros/src/codegen/resources.rs
+++ b/macros/src/codegen/resources.rs
@@ -89,7 +89,7 @@ pub fn codegen(
                 #[allow(non_camel_case_types)]
                 #(#cfgs)*
                 #cfg_core
-                use super::#name;
+                use super::resources::#name;
             ));
 
             const_app.push(util::impl_mutex(
@@ -107,6 +107,11 @@ pub fn codegen(
     let mod_resources = if mod_resources.is_empty() {
         quote!()
     } else {
+        // Also import the resource module
+        mod_resources_imports.push(quote!(
+            use super::resources;
+        ));
+
         quote!(mod resources {
             use rtic::export::Priority;
 
-- 
cgit v1.2.3


From a151974245a994ec4c30bb0518677c4b99dce7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Tue, 8 Sep 2020 15:22:32 +0000
Subject: cfg_core is gone, cargo fmt

---
 macros/src/codegen/resources.rs | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/macros/src/codegen/resources.rs b/macros/src/codegen/resources.rs
index a326e68..d18a465 100644
--- a/macros/src/codegen/resources.rs
+++ b/macros/src/codegen/resources.rs
@@ -88,7 +88,6 @@ pub fn codegen(
             mod_resources_imports.push(quote!(
                 #[allow(non_camel_case_types)]
                 #(#cfgs)*
-                #cfg_core
                 use super::resources::#name;
             ));
 
-- 
cgit v1.2.3


From 96e6350c0dfae37c3ea8032b4cc3113e37323ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Thu, 1 Oct 2020 16:17:15 +0000
Subject: Rename const_app to mod_app

---
 macros/src/codegen/resources.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/macros/src/codegen/resources.rs b/macros/src/codegen/resources.rs
index d18a465..38ea524 100644
--- a/macros/src/codegen/resources.rs
+++ b/macros/src/codegen/resources.rs
@@ -10,14 +10,14 @@ pub fn codegen(
     analysis: &Analysis,
     extra: &Extra,
 ) -> (
-    // const_app -- the `static [mut]` variables behind the proxies
+    // mod_app -- the `static [mut]` variables behind the proxies
     Vec<TokenStream2>,
     // mod_resources -- the `resources` module
     TokenStream2,
     // mod_resources_imports -- the `resources` module imports
     Vec<TokenStream2>,
 ) {
-    let mut const_app = vec![];
+    let mut mod_app = vec![];
     let mut mod_resources = vec![];
     let mut mod_resources_imports = vec![];
 
@@ -42,7 +42,7 @@ pub fn codegen(
             };
 
             let attrs = &res.attrs;
-            const_app.push(quote!(
+            mod_app.push(quote!(
                 #[allow(non_upper_case_globals)]
                 #(#attrs)*
                 #(#cfgs)*
@@ -91,7 +91,7 @@ pub fn codegen(
                 use super::resources::#name;
             ));
 
-            const_app.push(util::impl_mutex(
+            mod_app.push(util::impl_mutex(
                 extra,
                 cfgs,
                 true,
@@ -118,5 +118,5 @@ pub fn codegen(
         })
     };
 
-    (const_app, mod_resources, mod_resources_imports)
+    (mod_app, mod_resources, mod_resources_imports)
 }
-- 
cgit v1.2.3