max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove nrf prefix in features, for consistency with nrf-hal

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2020-09-24 19:56:47 +02:00
parent f9e2cef7f2
commit 4e4241bf90
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
embassy-nrf/Cargo.toml
View File

@ -15,11 +15,11 @@ defmt-info = []
defmt-warn = [] defmt-warn = []
defmt-error = [] defmt-error = []
nrf52810 = ["nrf52810-pac"] 52810 = ["nrf52810-pac"]
nrf52811 = ["nrf52811-pac"] 52811 = ["nrf52811-pac"]
nrf52832 = ["nrf52832-pac"] 52832 = ["nrf52832-pac"]
nrf52833 = ["nrf52833-pac"] 52833 = ["nrf52833-pac"]
nrf52840 = ["nrf52840-pac"] 52840 = ["nrf52840-pac"]
[dependencies] [dependencies]

44
embassy-nrf/src/lib.rs
View File

@ -4,37 +4,37 @@
#![feature(type_alias_impl_trait)] #![feature(type_alias_impl_trait)]
#[cfg(not(any( #[cfg(not(any(
feature = "nrf52810", feature = "52810",
feature = "nrf52811", feature = "52811",
feature = "nrf52832", feature = "52832",
feature = "nrf52833", feature = "52833",
feature = "nrf52840", feature = "52840",
)))] )))]
compile_error!("No chip feature activated. You must activate exactly one of the following features: nrf52810, nrf52811, nrf52832, nrf52833, nrf52840"); compile_error!("No chip feature activated. You must activate exactly one of the following features: 52810, 52811, 52832, 52833, 52840");
#[cfg(any( #[cfg(any(
all(feature = "nrf52810", feature = "nrf52811"), all(feature = "52810", feature = "52811"),
all(feature = "nrf52810", feature = "nrf52832"), all(feature = "52810", feature = "52832"),
all(feature = "nrf52810", feature = "nrf52833"), all(feature = "52810", feature = "52833"),
all(feature = "nrf52810", feature = "nrf52840"), all(feature = "52810", feature = "52840"),
all(feature = "nrf52811", feature = "nrf52832"), all(feature = "52811", feature = "52832"),
all(feature = "nrf52811", feature = "nrf52833"), all(feature = "52811", feature = "52833"),
all(feature = "nrf52811", feature = "nrf52840"), all(feature = "52811", feature = "52840"),
all(feature = "nrf52832", feature = "nrf52833"), all(feature = "52832", feature = "52833"),
all(feature = "nrf52832", feature = "nrf52840"), all(feature = "52832", feature = "52840"),
all(feature = "nrf52833", feature = "nrf52840"), all(feature = "52833", feature = "52840"),
))] ))]
compile_error!("Multile chip features activated. You must activate exactly one of the following features: nrf52810, nrf52811, nrf52832, nrf52833, nrf52840"); compile_error!("Multile chip features activated. You must activate exactly one of the following features: 52810, 52811, 52832, 52833, 52840");
#[cfg(feature = "nrf52810")] #[cfg(feature = "52810")]
pub use nrf52810_pac as pac; pub use nrf52810_pac as pac;
#[cfg(feature = "nrf52811")] #[cfg(feature = "52811")]
pub use nrf52811_pac as pac; pub use nrf52811_pac as pac;
#[cfg(feature = "nrf52832")] #[cfg(feature = "52832")]
pub use nrf52832_pac as pac; pub use nrf52832_pac as pac;
#[cfg(feature = "nrf52833")] #[cfg(feature = "52833")]
pub use nrf52833_pac as pac; pub use nrf52833_pac as pac;
#[cfg(feature = "nrf52840")] #[cfg(feature = "52840")]
pub use nrf52840_pac as pac; pub use nrf52840_pac as pac;
pub mod gpiote; pub mod gpiote;

2
examples/Cargo.toml
View File

@ -25,7 +25,7 @@ defmt-rtt = "0.1.0"
panic-probe = "0.1.0" panic-probe = "0.1.0"
nrf52840-hal = { version = "0.11.0" } nrf52840-hal = { version = "0.11.0" }
embassy = { version = "0.1.0", path = "../embassy" } embassy = { version = "0.1.0", path = "../embassy" }
embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt-trace", "nrf52840"] } embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt-trace", "52840"] }
static-executor = { version = "0.1.0", features=["defmt"]} static-executor = { version = "0.1.0", features=["defmt"]}
static-executor-cortex-m = { version = "0.1.0" } static-executor-cortex-m = { version = "0.1.0" }
futures = { version = "0.3.5", default-features = false } futures = { version = "0.3.5", default-features = false }