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

Use an em bikeshed instead of an underscore bikeshed.

Browse Source
This commit is contained in:
Bob McWhirter 2021-08-02 13:29:06 -04:00
parent 5f9447abb4
commit 63b32b39e1
6 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embassy-stm32/Cargo.toml
View File

@ -42,7 +42,7 @@ defmt-warn = [ ]
defmt-error = [ ] defmt-error = [ ]
sdmmc-rs = ["embedded-sdmmc"] sdmmc-rs = ["embedded-sdmmc"]
net = ["embassy-net", "vcell"] net = ["embassy-net", "vcell"]
memory_x = ["stm32-metapac/memory_x"] memory-x = ["stm32-metapac/memory-x"]
# Reexport stm32-metapac at `embassy_stm32::pac`. # Reexport stm32-metapac at `embassy_stm32::pac`.
# This is unstable because semver-minor (non-breaking) releases of embassy-stm32 may major-bump (breaking) the stm32-metapac version. # This is unstable because semver-minor (non-breaking) releases of embassy-stm32 may major-bump (breaking) the stm32-metapac version.

2
examples/stm32f4/Cargo.toml
View File

@ -19,7 +19,7 @@ defmt-error = []
[dependencies] [dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] } embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] } embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32f429zi", "unstable-pac", "memory_x"] } embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32f429zi", "unstable-pac", "memory-x"] }
embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
defmt = "0.2.0" defmt = "0.2.0"

2
examples/stm32h7/Cargo.toml
View File

@ -19,7 +19,7 @@ defmt-error = []
[dependencies] [dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] } embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] } embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "memory_x"] } embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "memory-x"] }
embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] } embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] }
stm32-metapac = { path = "../../stm32-metapac", features = ["stm32h743zi"] } stm32-metapac = { path = "../../stm32-metapac", features = ["stm32h743zi"] }

12
stm32-metapac-gen/src/assets/build.rs
View File

@ -9,17 +9,7 @@ fn main() {
.unwrap() .unwrap()
.to_ascii_lowercase(); .to_ascii_lowercase();
// Put `memory.x` in our output directory and ensure it's #[cfg(feature = "memory-x")]
// on the linker search path.
let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
//File::create(out.join("memory.x"))
//.unwrap()
//.write_all(include_bytes!("memory.x"))
//.unwrap();
println!("HOWDY");
#[cfg(feature = "memory_x")]
println!("cargo:rustc-link-search=src/chips/{}/memory_x/", _chip_name); println!("cargo:rustc-link-search=src/chips/{}/memory_x/", _chip_name);
#[cfg(feature = "rt")] #[cfg(feature = "rt")]

2
stm32-metapac/Cargo.toml
View File

@ -17,7 +17,7 @@ regex = "1.5.4"
[features] [features]
rt = ["cortex-m-rt/device"] rt = ["cortex-m-rt/device"]
memory_x = [] memory-x = []
# BEGIN GENERATED FEATURES # BEGIN GENERATED FEATURES
# Generated by gen_features.py. DO NOT EDIT. # Generated by gen_features.py. DO NOT EDIT.

2
stm32-metapac/build.rs
View File

@ -28,7 +28,7 @@ fn main() {
chip_name.to_ascii_lowercase() chip_name.to_ascii_lowercase()
); );
#[cfg(feature = "memory_x")] #[cfg(feature = "memory-x")]
println!( println!(
"cargo:rustc-link-search={}/src/chips/{}/memory_x/", "cargo:rustc-link-search={}/src/chips/{}/memory_x/",
out_dir.display(), out_dir.display(),