Update embedded-hal-bus to 0.2 and fix portable-atomic features

rtic-rs · Jun 23, 2024 · 861a63d · 861a63d
1 parent 918f9c3
commit 861a63d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 20 deletions.
diff --git a/examples/lm3s6965/Cargo.lock b/examples/lm3s6965/Cargo.lock
diff --git a/rtic-sync/CHANGELOG.md b/rtic-sync/CHANGELOG.md
@@ -10,6 +10,7 @@ For each category, _Added_, _Changed_, _Fixed_ add new entries at the top!
 ### Changed
 
 - Unstable features are now stable, the feature flag `unstable` is removed.
+- Update `embedded-hal-bus` to 0.2
 
 ### Added
 

diff --git a/rtic-sync/Cargo.toml b/rtic-sync/Cargo.toml
@@ -24,7 +24,7 @@ rtic-common = { version = "1.0.0", path = "../rtic-common" }
 portable-atomic = { version = "1", default-features = false }
 embedded-hal = { version = "1.0.0" }
 embedded-hal-async = { version = "1.0.0" }
-embedded-hal-bus = { version = "0.1.0", features = ["async"] }
+embedded-hal-bus = { version = "0.2.0", features = ["async"] }
 
 defmt-03 = { package = "defmt", version = "0.3", optional = true }
 

diff --git a/xtask/src/argument_parsing.rs b/xtask/src/argument_parsing.rs
@@ -73,30 +73,39 @@ impl Package {
                     ][..]
                 } else {
                     &[
-                        "cortex-m-systick,portable-atomic/critical-section",
-                        "cortex-m-systick,systick-64bit,portable-atomic/critical-section",
-                        "rp2040,portable-atomic/critical-section",
-                        "nrf52805,portable-atomic/critical-section",
-                        "nrf52810,portable-atomic/critical-section",
-                        "nrf52811,portable-atomic/critical-section",
-                        "nrf52832,portable-atomic/critical-section",
-                        "nrf52833,portable-atomic/critical-section",
-                        "nrf52840,portable-atomic/critical-section",
-                        "nrf5340-app,portable-atomic/critical-section",
-                        "nrf5340-net,portable-atomic/critical-section",
-                        "nrf9160,portable-atomic/critical-section",
-                        "imxrt_gpt1,imxrt_gpt2,imxrt-ral/imxrt1062,portable-atomic/critical-section",
-                        "stm32_tim2,stm32_tim3,stm32_tim4,stm32_tim5,stm32_tim15,stm32h725ag,portable-atomic/critical-section",
+                        "cortex-m-systick",
+                        "cortex-m-systick,systick-64bit",
+                        "rp2040",
+                        "nrf52805",
+                        "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",
                     ][..]
                 };
 
                 features
                     .iter()
-                    .map(ToString::to_string)
+                    .map(|&s| {
+                        if matches!(backend, Backends::Thumbv6) {
+                            format!("{s},portable-atomic/critical-section")
+                        } else {
+                            s.to_string()
+                        }
+                    })
                     .map(Some)
                     .chain(std::iter::once(None))
                     .collect()
             }
+            Package::RticSync if matches!(backend, Backends::Thumbv6) => {
+                vec![Some("portable-atomic/critical-section".into())]
+            }
             _ => vec![None],
         }
     }