1 files changed, 7 insertions, 3 deletions
diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs
index 9cb5f7a9..53de50b9 100644
--- a/macros/src/codegen/software_tasks.rs
+++ b/macros/src/codegen/software_tasks.rs
@@ -57,15 +57,19 @@ pub fn codegen(
             .map(|_| quote!(core::mem::MaybeUninit::uninit()))
             .collect::<Vec<_>>();
 
-        if let Some(m) = &extra.monotonic {
-            let instants = util::instants_ident(name);
+        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<<#m as rtic::Monotonic>::Instant>; #cap_lit] =
+                    [core::mem::MaybeUninit<rtic::time::Instant<#app_path::#m>>; #cap_lit] =
                     [#(#elems,)*];
             ));
         }