From 8e8ec9b7b879adae8d4de6cb2320b9b19290a7e0 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sat, 12 Dec 2020 23:24:54 +0100
Subject: Monotonic codegen now passing compile stage

---
 macros/src/codegen/software_tasks.rs | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(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 7b884ead..ebe7bdf4 100644
--- a/macros/src/codegen/software_tasks.rs
+++ b/macros/src/codegen/software_tasks.rs
@@ -57,19 +57,22 @@ pub fn codegen(
             .map(|_| quote!(core::mem::MaybeUninit::uninit()))
             .collect::<Vec<_>>();
 
-        // TODO: Update for new monotonic
-        // if let Some(m) = &extra.monotonic {
-        //     let instants = util::instants_ident(name);
-
-        //     let uninit = mk_uninit();
-        //     mod_app.push(quote!(
-        //         #uninit
-        //         /// Buffer that holds the instants associated to the inputs of a task
-        //         static mut #instants:
-        //             [core::mem::MaybeUninit<<#m as rtic::Monotonic>::Instant>; #cap_lit] =
-        //             [#(#elems,)*];
-        //     ));
-        // }
+        let app_name = &app.name;
+        let app_path = quote! {crate::#app_name};
+
+        for (_, monotonic) in &app.monotonics {
+            let instants = util::monotonic_instants_ident(name, &monotonic.ident);
+            let m = &monotonic.ident;
+
+            let uninit = mk_uninit();
+            mod_app.push(quote!(
+                #uninit
+                /// Buffer that holds the instants associated to the inputs of a task
+                static mut #instants:
+                    [core::mem::MaybeUninit<rtic::Instant<#app_path::#m>>; #cap_lit] =
+                    [#(#elems,)*];
+            ));
+        }
 
         let uninit = mk_uninit();
         let inputs_ident = util::inputs_ident(name);
-- 
cgit v1.2.3