From b23bb1192c8dc1f2e8f157db2147b1737abc1033 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Tue, 8 Dec 2020 20:49:13 +0100
Subject: TQ handlers being generated

---
 macros/src/codegen/pre_init.rs | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

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

diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs
index 969de84..dfdb30a 100644
--- a/macros/src/codegen/pre_init.rs
+++ b/macros/src/codegen/pre_init.rs
@@ -74,24 +74,25 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
         );));
     }
 
-    // Initialize the SysTick if there exist a TimerQueue
-    if extra.monotonic.is_some() {
-        let priority = analysis.channels.keys().max().unwrap();
-
-        // Compile time assert that this priority is supported by the device
-        stmts.push(quote!(let _ = [(); ((1 << #nvic_prio_bits) - #priority as usize)];));
-
-        stmts.push(quote!(core.SCB.set_priority(
-            rtic::export::SystemHandler::SysTick,
-            rtic::export::logical2hw(#priority, #nvic_prio_bits),
-        );));
-
-        stmts.push(quote!(
-            core.SYST.set_clock_source(rtic::export::SystClkSource::Core);
-            core.SYST.enable_counter();
-            core.DCB.enable_trace();
-        ));
-    }
+    // TODO: Update for noew monotonic
+    // // Initialize the SysTick if there exist a TimerQueue
+    // if extra.monotonic.is_some() {
+    //     let priority = analysis.channels.keys().max().unwrap();
+
+    //     // Compile time assert that this priority is supported by the device
+    //     stmts.push(quote!(let _ = [(); ((1 << #nvic_prio_bits) - #priority as usize)];));
+
+    //     stmts.push(quote!(core.SCB.set_priority(
+    //         rtic::export::SystemHandler::SysTick,
+    //         rtic::export::logical2hw(#priority, #nvic_prio_bits),
+    //     );));
+
+    //     stmts.push(quote!(
+    //         core.SYST.set_clock_source(rtic::export::SystClkSource::Core);
+    //         core.SYST.enable_counter();
+    //         core.DCB.enable_trace();
+    //     ));
+    // }
 
     // If there's no user `#[idle]` then optimize returning from interrupt handlers
     if app.idles.is_empty() {
-- 
cgit v1.2.3


From 97a48983d2859740983cbf342e1287182426ed44 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Thu, 10 Dec 2020 20:33:13 +0100
Subject: More work

---
 macros/src/codegen/pre_init.rs | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

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

diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs
index dfdb30a..26ba558 100644
--- a/macros/src/codegen/pre_init.rs
+++ b/macros/src/codegen/pre_init.rs
@@ -74,25 +74,26 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
         );));
     }
 
-    // TODO: Update for noew monotonic
-    // // Initialize the SysTick if there exist a TimerQueue
-    // if extra.monotonic.is_some() {
-    //     let priority = analysis.channels.keys().max().unwrap();
-
-    //     // Compile time assert that this priority is supported by the device
-    //     stmts.push(quote!(let _ = [(); ((1 << #nvic_prio_bits) - #priority as usize)];));
-
-    //     stmts.push(quote!(core.SCB.set_priority(
-    //         rtic::export::SystemHandler::SysTick,
-    //         rtic::export::logical2hw(#priority, #nvic_prio_bits),
-    //     );));
-
-    //     stmts.push(quote!(
-    //         core.SYST.set_clock_source(rtic::export::SystClkSource::Core);
-    //         core.SYST.enable_counter();
-    //         core.DCB.enable_trace();
-    //     ));
-    // }
+    // Initialize monotonic's interrupts
+    for (priority, name) in app
+        .monotonics
+        .iter()
+        .map(|(_, monotonic)| (&monotonic.args.priority, &monotonic.args.binds))
+    {
+        // Compile time assert that this priority is supported by the device
+        stmts.push(quote!(let _ = [(); ((1 << #nvic_prio_bits) - #priority as usize)];));
+
+        // NOTE this also checks that the interrupt exists in the `Interrupt` enumeration
+        let interrupt = util::interrupt_ident();
+        stmts.push(quote!(
+            core.NVIC.set_priority(
+                you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml::#interrupt::#name,
+                rtic::export::logical2hw(#priority, #nvic_prio_bits),
+            );
+        ));
+
+        // NOTE we do not unmask the interrupt as this is part of the monotonic to keep track of
+    }
 
     // If there's no user `#[idle]` then optimize returning from interrupt handlers
     if app.idles.is_empty() {
-- 
cgit v1.2.3


From 62771839061aaa7dd518d40969bee609d7d2bda8 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sun, 13 Dec 2020 14:52:16 +0100
Subject: Now handling SysTick as well

---
 macros/src/codegen/pre_init.rs | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

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

diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs
index 26ba558..e7b1b03 100644
--- a/macros/src/codegen/pre_init.rs
+++ b/macros/src/codegen/pre_init.rs
@@ -8,6 +8,8 @@ use crate::{analyze::Analysis, check::Extra, codegen::util};
 pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream2> {
     let mut stmts = vec![];
 
+    let rt_err = util::rt_err_ident();
+
     // Disable interrupts -- `init` must run with interrupts disabled
     stmts.push(quote!(rtic::export::interrupt::disable();));
 
@@ -47,14 +49,14 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
         let interrupt = util::interrupt_ident();
         stmts.push(quote!(
             core.NVIC.set_priority(
-                you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml::#interrupt::#name,
+                #rt_err::#interrupt::#name,
                 rtic::export::logical2hw(#priority, #nvic_prio_bits),
             );
         ));
 
         // NOTE unmask the interrupt *after* setting its priority: changing the priority of a pended
         // interrupt is implementation defined
-        stmts.push(quote!(rtic::export::NVIC::unmask(you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml::#interrupt::#name);));
+        stmts.push(quote!(rtic::export::NVIC::unmask(#rt_err::#interrupt::#name);));
     }
 
     // Set exception priorities
@@ -83,14 +85,24 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
         // Compile time assert that this priority is supported by the device
         stmts.push(quote!(let _ = [(); ((1 << #nvic_prio_bits) - #priority as usize)];));
 
-        // NOTE this also checks that the interrupt exists in the `Interrupt` enumeration
-        let interrupt = util::interrupt_ident();
-        stmts.push(quote!(
-            core.NVIC.set_priority(
-                you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml::#interrupt::#name,
-                rtic::export::logical2hw(#priority, #nvic_prio_bits),
-            );
-        ));
+
+        if &*name.to_string() == "SysTick" {
+            stmts.push(quote!(
+                core.SCB.set_priority(
+                    rtic::export::SystemHandler::SysTick,
+                    rtic::export::logical2hw(#priority, #nvic_prio_bits),
+                );
+            ));
+        } else {
+            // NOTE this also checks that the interrupt exists in the `Interrupt` enumeration
+            let interrupt = util::interrupt_ident();
+            stmts.push(quote!(
+                core.NVIC.set_priority(
+                    #rt_err::#interrupt::#name,
+                    rtic::export::logical2hw(#priority, #nvic_prio_bits),
+                );
+            ));
+        }
 
         // NOTE we do not unmask the interrupt as this is part of the monotonic to keep track of
     }
-- 
cgit v1.2.3


From ebf2f058a4d2a1fcf118144b9893dc3038939bad Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Thu, 18 Feb 2021 19:30:59 +0100
Subject: Now with new monotonic trait and crate

---
 macros/src/codegen/pre_init.rs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

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

diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs
index e7b1b03..fbfff3b 100644
--- a/macros/src/codegen/pre_init.rs
+++ b/macros/src/codegen/pre_init.rs
@@ -77,14 +77,17 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
     }
 
     // Initialize monotonic's interrupts
-    for (priority, name) in app
+    for (ident, priority, name) in app
         .monotonics
         .iter()
-        .map(|(_, monotonic)| (&monotonic.args.priority, &monotonic.args.binds))
+        .map(|(ident, monotonic)| (ident, &monotonic.args.priority, &monotonic.args.binds))
     {
         // Compile time assert that this priority is supported by the device
         stmts.push(quote!(let _ = [(); ((1 << #nvic_prio_bits) - #priority as usize)];));
 
+        let app_name = &app.name;
+        let app_path = quote! {crate::#app_name};
+        let mono_type = util::mangle_monotonic_type(&ident.to_string());
 
         if &*name.to_string() == "SysTick" {
             stmts.push(quote!(
@@ -92,6 +95,12 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
                     rtic::export::SystemHandler::SysTick,
                     rtic::export::logical2hw(#priority, #nvic_prio_bits),
                 );
+
+                // Always enable monotonic interrupts if they should never be off
+                if !#app_path::#mono_type::DISABLE_INTERRUPT_ON_EMPTY_QUEUE {
+                    core::mem::transmute::<_, cortex_m::peripheral::SYST>(())
+                        .enable_interrupt();
+                }
             ));
         } else {
             // NOTE this also checks that the interrupt exists in the `Interrupt` enumeration
@@ -101,10 +110,13 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
                     #rt_err::#interrupt::#name,
                     rtic::export::logical2hw(#priority, #nvic_prio_bits),
                 );
+
+                // Always enable monotonic interrupts if they should never be off
+                if !#app_path::#mono_type::DISABLE_INTERRUPT_ON_EMPTY_QUEUE {
+                    rtic::export::NVIC::unmask(#app_path::#rt_err::#interrupt::#name);
+                }
             ));
         }
-
-        // NOTE we do not unmask the interrupt as this is part of the monotonic to keep track of
     }
 
     // If there's no user `#[idle]` then optimize returning from interrupt handlers
-- 
cgit v1.2.3


From d351f55e1c8e60a9bbd69b40b84a39dab5d20051 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Thu, 25 Feb 2021 19:05:39 +0100
Subject: Documentation generation fixes

Test fixes
---
 macros/src/codegen/pre_init.rs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

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

diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs
index fbfff3b..d510544 100644
--- a/macros/src/codegen/pre_init.rs
+++ b/macros/src/codegen/pre_init.rs
@@ -17,6 +17,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
     for (name, task) in &app.software_tasks {
         let cap = task.args.capacity;
         let fq_ident = util::fq_ident(name);
+        let fq_ident = util::mark_internal_ident(&fq_ident);
 
         stmts.push(quote!(
             (0..#cap).for_each(|i| #fq_ident.enqueue_unchecked(i));
@@ -77,19 +78,20 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
     }
 
     // Initialize monotonic's interrupts
-    for (ident, priority, name) in app
-        .monotonics
-        .iter()
-        .map(|(ident, monotonic)| (ident, &monotonic.args.priority, &monotonic.args.binds))
+    for (_, monotonic) in app.monotonics.iter()
+    //.map(|(ident, monotonic)| (ident, &monotonic.args.priority, &monotonic.args.binds))
     {
+        let priority = &monotonic.args.priority;
+        let binds = &monotonic.args.binds;
+
         // Compile time assert that this priority is supported by the device
         stmts.push(quote!(let _ = [(); ((1 << #nvic_prio_bits) - #priority as usize)];));
 
         let app_name = &app.name;
         let app_path = quote! {crate::#app_name};
-        let mono_type = util::mangle_monotonic_type(&ident.to_string());
+        let mono_type = &monotonic.ty;
 
-        if &*name.to_string() == "SysTick" {
+        if &*binds.to_string() == "SysTick" {
             stmts.push(quote!(
                 core.SCB.set_priority(
                     rtic::export::SystemHandler::SysTick,
@@ -97,7 +99,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
                 );
 
                 // Always enable monotonic interrupts if they should never be off
-                if !#app_path::#mono_type::DISABLE_INTERRUPT_ON_EMPTY_QUEUE {
+                if !<#mono_type as rtic::Monotonic>::DISABLE_INTERRUPT_ON_EMPTY_QUEUE {
                     core::mem::transmute::<_, cortex_m::peripheral::SYST>(())
                         .enable_interrupt();
                 }
@@ -107,13 +109,13 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
             let interrupt = util::interrupt_ident();
             stmts.push(quote!(
                 core.NVIC.set_priority(
-                    #rt_err::#interrupt::#name,
+                    #rt_err::#interrupt::#binds,
                     rtic::export::logical2hw(#priority, #nvic_prio_bits),
                 );
 
                 // Always enable monotonic interrupts if they should never be off
-                if !#app_path::#mono_type::DISABLE_INTERRUPT_ON_EMPTY_QUEUE {
-                    rtic::export::NVIC::unmask(#app_path::#rt_err::#interrupt::#name);
+                if !<#mono_type as rtic::Monotonic>::DISABLE_INTERRUPT_ON_EMPTY_QUEUE {
+                    rtic::export::NVIC::unmask(#app_path::#rt_err::#interrupt::#binds);
                 }
             ));
         }
-- 
cgit v1.2.3