mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-23 12:12:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Emil Fresk 2024-06-23 09:13:43 +02:00
parent 918f9c3f13
commit 861a63dbe3
4 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
examples/lm3s6965/Cargo.lock generated
View file

@ -110,13 +110,14 @@ dependencies = [
[[package]] [[package]]
name = "embedded-hal-bus" name = "embedded-hal-bus"
version = "0.1.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57b4e6ede84339ebdb418cd986e6320a34b017cdf99b5cc3efceec6450b06886" checksum = "0d3980bf28e8577db59fe2bdb3df868a419469d2cecb363644eea2b6f7797669"
dependencies = [ dependencies = [
"critical-section", "critical-section",
"embedded-hal 1.0.0", "embedded-hal 1.0.0",
"embedded-hal-async", "embedded-hal-async",
"portable-atomic",
] ]
[[package]] [[package]]
@ -385,7 +386,7 @@ dependencies = [
[[package]] [[package]]
name = "rtic-monotonics" name = "rtic-monotonics"
version = "2.0.0" version = "2.0.1"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"cortex-m", "cortex-m",
@ -396,7 +397,7 @@ dependencies = [
[[package]] [[package]]
name = "rtic-sync" name = "rtic-sync"
version = "1.3.0" version = "1.3.1-alpha.1"
dependencies = [ dependencies = [
"critical-section", "critical-section",
"embedded-hal 1.0.0", "embedded-hal 1.0.0",

1
rtic-sync/CHANGELOG.md
View file

@ -10,6 +10,7 @@ For each category, _Added_, _Changed_, _Fixed_ add new entries at the top!
### Changed ### Changed
- Unstable features are now stable, the feature flag `unstable` is removed. - Unstable features are now stable, the feature flag `unstable` is removed.
- Update `embedded-hal-bus` to 0.2
### Added ### Added

2
rtic-sync/Cargo.toml
View file

@ -24,7 +24,7 @@ rtic-common = { version = "1.0.0", path = "../rtic-common" }
portable-atomic = { version = "1", default-features = false } portable-atomic = { version = "1", default-features = false }
embedded-hal = { version = "1.0.0" } embedded-hal = { version = "1.0.0" }
embedded-hal-async = { 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 } defmt-03 = { package = "defmt", version = "0.3", optional = true }

39
xtask/src/argument_parsing.rs
View file

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