Merge #694

694: RTIC 2 r=AfoHT a=korken89



Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
Co-authored-by: Per Lindgren <per.lindgren@ltu.se>

1 files changed, 36 insertions, 0 deletions

diff --git a/rtic-macros/src/syntax/optimize.rs b/rtic-macros/src/syntax/optimize.rs
new file mode 100644
index 00000000..e83ba31b
--- /dev/null
+++ b/rtic-macros/src/syntax/optimize.rs
@@ -0,0 +1,36 @@
+use std::collections::{BTreeSet, HashMap};
+
+use crate::syntax::ast::App;
+
+pub fn app(app: &mut App, settings: &Settings) {
+    // "compress" priorities
+    // If the user specified, for example, task priorities of "1, 3, 6",
+    // compress them into "1, 2, 3" as to leave no gaps
+    if settings.optimize_priorities {
+        // all task priorities ordered in ascending order
+        let priorities = app
+            .hardware_tasks
+            .values()
+            .map(|task| Some(task.args.priority))
+            .chain(
+                app.software_tasks
+                    .values()
+                    .map(|task| Some(task.args.priority)),
+            )
+            .collect::<BTreeSet<_>>();
+
+        let map = priorities
+            .iter()
+            .cloned()
+            .zip(1..)
+            .collect::<HashMap<_, _>>();
+
+        for task in app.hardware_tasks.values_mut() {
+            task.args.priority = map[&Some(task.args.priority)];
+        }
+
+        for task in app.software_tasks.values_mut() {
+            task.args.priority = map[&Some(task.args.priority)];
+        }
+    }
+}