From 918f9c3f13a75d6d01f283702353ebc31bf36c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Sun, 23 Jun 2024 08:45:49 +0200 Subject: Breaking change: portable-atomic (#922) * Atomics: Replace polyfill with portable-atomic * Update Cargo.lock for examples * RTIC: portable-atomic: Update changelog * rtic-monotonics: portable-atomic: Update changelog * lm3s6965: enable critical-section when testing * xtask: Enable portable-atomic/critical-section When dealing with rtic-monotonics * rtic-monotonics: portable-atomics: Do not disable the ability to fallback --------- Co-authored-by: Emil Fresk --- examples/stm32g030f6_periodic_prints/Cargo.lock | 19 +++++-------------- examples/stm32g030f6_periodic_prints/Cargo.toml | 1 + 2 files changed, 6 insertions(+), 14 deletions(-) (limited to 'examples/stm32g030f6_periodic_prints') diff --git a/examples/stm32g030f6_periodic_prints/Cargo.lock b/examples/stm32g030f6_periodic_prints/Cargo.lock index 65dbf61..11bd8c2 100644 --- a/examples/stm32g030f6_periodic_prints/Cargo.lock +++ b/examples/stm32g030f6_periodic_prints/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", -] - [[package]] name = "bare-metal" version = "0.2.5" @@ -298,12 +289,12 @@ dependencies = [ [[package]] name = "rtic" -version = "2.0.1" +version = "2.1.1" dependencies = [ - "atomic-polyfill", "bare-metal 1.0.0", "cortex-m", "critical-section", + "portable-atomic", "rtic-core", "rtic-macros", ] @@ -324,7 +315,7 @@ checksum = "d9369355b04d06a3780ec0f51ea2d225624db777acbc60abd8ca4832da5c1a42" [[package]] name = "rtic-macros" -version = "2.0.1" +version = "2.1.0" dependencies = [ "indexmap", "proc-macro-error", @@ -337,11 +328,10 @@ dependencies = [ name = "rtic-monotonics" version = "2.0.0" dependencies = [ - "atomic-polyfill", "cfg-if", "cortex-m", - "embedded-hal 1.0.0", "fugit", + "portable-atomic", "proc-macro2", "quote", "rtic-time", @@ -415,6 +405,7 @@ dependencies = [ "defmt-rtt", "fugit", "panic-probe", + "portable-atomic", "rtic", "rtic-monotonics", "stm32g0xx-hal", diff --git a/examples/stm32g030f6_periodic_prints/Cargo.toml b/examples/stm32g030f6_periodic_prints/Cargo.toml index d8d8e35..4d79f1f 100644 --- a/examples/stm32g030f6_periodic_prints/Cargo.toml +++ b/examples/stm32g030f6_periodic_prints/Cargo.toml @@ -25,6 +25,7 @@ defmt = "0.3.4" defmt-rtt = "0.4.0" fugit = "0.3.7" panic-probe = { version = "0.3.1", features = ["print-defmt"] } +portable-atomic = { version = "1", features = ["unsafe-assume-single-core"] } stm32g0xx-hal = { version = "0.2.0", features = ["rt", "stm32g030"] } -- cgit v1.2.3