Merge pull request #401 from quartiq/dependabot/cargo/rtic-monotonics…

…-2.0.1 Bump rtic-monotonics from 1.5.0 to 2.0.1
quartiq · Jun 20, 2024 · 2b0556d · 2b0556d
2 parents 82e608f + 907f055
commit 2b0556d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,7 +35,7 @@ fugit = "0.3"
 rtic-sync = "1"
 sequential-storage = "0.6"
 rtic = {version = "2.1", features = ["thumbv7-backend"] }
-rtic-monotonics = { version = "1.5", features = ["cortex-m-systick"] }
+rtic-monotonics = { version = "2.0", features = ["cortex-m-systick"] }
 rand_core = "0.6"
 mono-clock = "0.1"
 cortex-m-log = { version = "0.8.0", features = ["log-integration"] }

diff --git a/src/hardware/mod.rs b/src/hardware/mod.rs
@@ -19,7 +19,7 @@ pub mod usb;
 pub mod user_interface;
 
 pub const MONOTONIC_FREQUENCY: u32 = 1_000;
-pub type Systick = rtic_monotonics::systick::Systick;
+rtic_monotonics::systick_monotonic!(Systick, MONOTONIC_FREQUENCY);
 pub type SystemTimer = mono_clock::MonoClock<u32, MONOTONIC_FREQUENCY>;
 
 pub const CPU_FREQ: u32 = 168_000_000;

diff --git a/src/hardware/setup.rs b/src/hardware/setup.rs
@@ -130,8 +130,7 @@ pub fn setup(
         .require_pll48clk()
         .freeze();
 
-    let mono_token = rtic_monotonics::create_systick_token!();
-    Systick::start(core.SYST, clocks.sysclk().to_Hz(), mono_token);
+    Systick::start(core.SYST, clocks.sysclk().to_Hz());
 
     // Start the watchdog during the initialization process.
     let mut watchdog = hal::watchdog::IndependentWatchdog::new(device.IWDG);