Merge branch 'master' into adc_with_mpsc_channel_example

rtic-rs · Jun 23, 2024 · 697aa00 · 697aa00
2 parents 9a09a4d + 861a63d
commit 697aa00
Show file tree

Hide file tree

Showing 28 changed files with 94 additions and 138 deletions.
diff --git a/examples/esp32c3/Cargo.lock b/examples/esp32c3/Cargo.lock
diff --git a/examples/hifive1/Cargo.lock b/examples/hifive1/Cargo.lock
diff --git a/examples/lm3s6965/Cargo.lock b/examples/lm3s6965/Cargo.lock
diff --git a/examples/lm3s6965/Cargo.toml b/examples/lm3s6965/Cargo.toml
@@ -30,7 +30,10 @@ features = ["exit"]
 version = "0.6.0"
 
 [features]
-test-critical-section = ["rtic/test-critical-section"]
+test-critical-section = [
+  "rtic/test-critical-section",
+  "cortex-m/critical-section-single-core",
+]
 thumbv6-backend = ["rtic/thumbv6-backend"]
 thumbv7-backend = ["rtic/thumbv7-backend"]
 thumbv8base-backend = ["rtic/thumbv8base-backend"]

diff --git a/examples/nrf52840_blinky/Cargo.lock b/examples/nrf52840_blinky/Cargo.lock
diff --git a/examples/rp2040_local_i2c_init/Cargo.lock b/examples/rp2040_local_i2c_init/Cargo.lock
diff --git a/examples/rp2040_local_i2c_init/Cargo.toml b/examples/rp2040_local_i2c_init/Cargo.toml
@@ -24,6 +24,7 @@ embedded-hal = { version = "0.2.7", features = ["unproven"] }
 fugit = "0.3"
 rp-pico = "0.9.0"
 panic-probe = "0.3"
+portable-atomic = { version = "1", features = ["critical-section"] }
 
 [profile.dev]
 opt-level = 1

diff --git a/examples/stm32f3_blinky/Cargo.lock b/examples/stm32f3_blinky/Cargo.lock
diff --git a/examples/stm32g030f6_periodic_prints/Cargo.lock b/examples/stm32g030f6_periodic_prints/Cargo.lock
diff --git 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"] }