From 861a63dbe31f8c1062bbc9a7eca012370ac26d76 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sun, 23 Jun 2024 09:13:43 +0200
Subject: [PATCH] Update `embedded-hal-bus` to 0.2 and fix `portable-atomic`
 features

---
 examples/lm3s6965/Cargo.lock  |  9 ++++----
 rtic-sync/CHANGELOG.md        |  1 +
 rtic-sync/Cargo.toml          |  2 +-
 xtask/src/argument_parsing.rs | 39 +++++++++++++++++++++--------------
 4 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/examples/lm3s6965/Cargo.lock b/examples/lm3s6965/Cargo.lock
index d7537dcafd..c007019fa2 100644
--- a/examples/lm3s6965/Cargo.lock
+++ b/examples/lm3s6965/Cargo.lock
@@ -110,13 +110,14 @@ dependencies = [
 
 [[package]]
 name = "embedded-hal-bus"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b4e6ede84339ebdb418cd986e6320a34b017cdf99b5cc3efceec6450b06886"
+checksum = "0d3980bf28e8577db59fe2bdb3df868a419469d2cecb363644eea2b6f7797669"
 dependencies = [
  "critical-section",
  "embedded-hal 1.0.0",
  "embedded-hal-async",
+ "portable-atomic",
 ]
 
 [[package]]
@@ -385,7 +386,7 @@ dependencies = [
 
 [[package]]
 name = "rtic-monotonics"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "cfg-if",
  "cortex-m",
@@ -396,7 +397,7 @@ dependencies = [
 
 [[package]]
 name = "rtic-sync"
-version = "1.3.0"
+version = "1.3.1-alpha.1"
 dependencies = [
  "critical-section",
  "embedded-hal 1.0.0",
diff --git a/rtic-sync/CHANGELOG.md b/rtic-sync/CHANGELOG.md
index 6cd3a36ad9..9fcb798e24 100644
--- 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
index 6d9358f2d1..f231929c3d 100644
--- 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
index 14920fdf72..8707ec5d12 100644
--- 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],
         }
     }