From 524273c96a978299b64e51a9cdcc007585a0f170 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sun, 11 Oct 2020 18:38:38 +0200
Subject: Now with spawn/schedule from anywhere

---
 macros/src/codegen/pre_init.rs | 8 ++++----
 1 file changed, 4 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 9c5f35ec..bc87b1df 100644
--- a/macros/src/codegen/pre_init.rs
+++ b/macros/src/codegen/pre_init.rs
@@ -12,10 +12,10 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
     stmts.push(quote!(rtic::export::interrupt::disable();));
 
     // Populate the FreeQueue
-    for fq in &analysis.free_queues {
+    for fq in &app.software_tasks {
         // Get the task name
         let name = fq.0;
-        let task = &app.software_tasks[name];
+        let task = fq.1;
         let cap = task.args.capacity;
 
         let fq_ident = util::fq_ident(name);
@@ -81,8 +81,8 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
     }
 
     // Initialize the SysTick if there exist a TimerQueue
-    if let Some(tq) = analysis.timer_queues.first() {
-        let priority = tq.priority;
+    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)];));
-- 
cgit v1.2.3