From 8c23e178f3838bcdd13662a2ffefd39ec144e869 Mon Sep 17 00:00:00 2001
From: Finomnis <Finomnis@users.noreply.github.com>
Date: Thu, 11 Apr 2024 00:00:38 +0200
Subject: Monotonic rewrite (#874)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Rework timer_queue and monotonic architecture

Goals:
 * make Monotonic purely internal
 * make Monotonic purely tick passed, no fugit involved
 * create a wrapper struct in the user's code via a macro that then
   converts the "now" from the tick based monotonic to a fugit based
   timestamp

We need to proxy the delay functions of the timer queue anyway,
so we could simply perform the conversion in those proxy functions.

* Update cargo.lock

* Update readme of rtic-time

* CI: ESP32: Redact esp_image: Too volatile

* Fixup: Changelog double entry rebase mistake

---------

Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
---
 xtask/src/argument_parsing.rs | 37 ++++++++++++++++++++-----------------
 xtask/src/run.rs              | 21 ++++++++++++++++++++-
 2 files changed, 40 insertions(+), 18 deletions(-)

(limited to 'xtask/src')

diff --git a/xtask/src/argument_parsing.rs b/xtask/src/argument_parsing.rs
index f72be77..c327af8 100644
--- a/xtask/src/argument_parsing.rs
+++ b/xtask/src/argument_parsing.rs
@@ -64,25 +64,28 @@ impl Package {
             }
             Package::RticMonotonics => {
                 let features = if partial {
-                    &["cortex-m-systick", "rp2040", "nrf52840"][..]
+                    &[
+                        "cortex-m-systick",
+                        "rp2040",
+                        "nrf52840",
+                        "imxrt_gpt1,imxrt-ral/imxrt1062",
+                        "stm32_tim2,stm32h725ag",
+                    ][..]
                 } else {
                     &[
-                        "cortex-m-systick,embedded-hal-async",
-                        "cortex-m-systick,systick-100hz,embedded-hal-async",
-                        "cortex-m-systick,systick-10khz,embedded-hal-async",
-                        "cortex-m-systick,embedded-hal-async,systick-64bit",
-                        "cortex-m-systick,systick-100hz,embedded-hal-async,systick-64bit",
-                        "cortex-m-systick,systick-10khz,embedded-hal-async,systick-64bit",
-                        "rp2040,embedded-hal-async",
-                        "nrf52810,embedded-hal-async",
-                        "nrf52811,embedded-hal-async",
-                        "nrf52832,embedded-hal-async",
-                        "nrf52833,embedded-hal-async",
-                        "nrf52840,embedded-hal-async",
-                        "nrf5340-app,embedded-hal-async",
-                        "nrf5340-net,embedded-hal-async",
-                        "nrf9160,embedded-hal-async",
-                        "imxrt_gpt1,imxrt-ral/imxrt1062,embedded-hal-async",
+                        "cortex-m-systick",
+                        "cortex-m-systick,systick-64bit",
+                        "rp2040",
+                        "nrf52810",
+                        "nrf52811",
+                        "nrf52832",
+                        "nrf52833",
+                        "nrf52840",
+                        "nrf5340-app",
+                        "nrf5340-net",
+                        "nrf9160",
+                        "imxrt_gpt1,imxrt_gpt2,imxrt-ral/imxrt1062",
+                        "stm32_tim2,stm32_tim3,stm32_tim4,stm32_tim5,stm32_tim15,stm32h725ag",
                     ][..]
                 };
 
diff --git a/xtask/src/run.rs b/xtask/src/run.rs
index ff81e6a..a36c98c 100644
--- a/xtask/src/run.rs
+++ b/xtask/src/run.rs
@@ -299,7 +299,26 @@ pub fn cargo_doc<'c>(
     backend: Backends,
     arguments: &'c Option<ExtraArguments>,
 ) -> Vec<FinalRunResult<'c>> {
-    let features = Some(backend.to_target().and_features(backend.to_rtic_feature()));
+    let extra_doc_features = [
+        "rtic-monotonics/cortex-m-systick",
+        "rtic-monotonics/rp2040",
+        "rtic-monotonics/nrf52840",
+        "imxrt-ral/imxrt1011",
+        "rtic-monotonics/imxrt_gpt1",
+        "rtic-monotonics/imxrt_gpt2",
+        "rtic-monotonics/stm32h725ag",
+        "rtic-monotonics/stm32_tim2",
+        "rtic-monotonics/stm32_tim3",
+        "rtic-monotonics/stm32_tim4",
+        "rtic-monotonics/stm32_tim5",
+        "rtic-monotonics/stm32_tim15",
+    ];
+
+    let features = Some(format!(
+        "{},{}",
+        backend.to_target().and_features(backend.to_rtic_feature()),
+        extra_doc_features.join(",")
+    ));
 
     let command = CargoCommand::Doc {
         cargoarg,
-- 
cgit v1.2.3