501: stm32-metapac cleanups r=Dirbaio a=Dirbaio



Co-authored-by: Dario Nieuwenhuis <dirbaio@dirbaio.net>
This commit is contained in:
bors[bot] 2021-11-24 01:00:22 +00:00 committed by GitHub
commit 8fea6c94f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 734 additions and 724 deletions

View file

@ -12,7 +12,7 @@ env:
jobs:
all:
runs-on: ubuntu-20.04
needs: [build, test, metapac_gen]
needs: [build, test]
steps:
- name: Done
run: exit 0
@ -45,12 +45,3 @@ jobs:
- uses: actions/checkout@v2
- name: Test
run: cd embassy && cargo test
metapac_gen:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Generate pregenerated metapac
run: cd stm32-metapac-gen; cargo run --release

9
ci.sh
View file

@ -7,6 +7,13 @@ export RUSTFLAGS=-Dwarnings
find -name '*.rs' -not -path '*target*' -not -path '*stm32-metapac-gen/out/*' | xargs rustfmt --check --skip-children --unstable-features --edition 2018
# Generate stm32-metapac
# for some reason Cargo stomps the cache if we don't specify --target.
# This happens with vanilla Cargo, not just cargo-batch. Bug?
(cd stm32-metapac-gen; cargo run --release --target x86_64-unknown-linux-gnu)
rm -rf stm32-metapac
mv stm32-metapac-gen/out stm32-metapac
cargo batch \
--- build --release --manifest-path embassy/Cargo.toml --target thumbv7em-none-eabi \
--- build --release --manifest-path embassy/Cargo.toml --target thumbv7em-none-eabi --features log,executor-agnostic \
@ -28,7 +35,7 @@ cargo batch \
--- build --release --manifest-path embassy-nrf/Cargo.toml --target thumbv7em-none-eabi --features nrf52840,defmt \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32f411ce,defmt \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32f429zi,log \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32h755zi_cm7,defmt \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32h755zi-cm7,defmt \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32l476vg,defmt \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features stm32l072cz,defmt \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features stm32l151cb-a,defmt \

View file

@ -34,8 +34,6 @@ cfg-if = "1.0.0"
[build-dependencies]
stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", default-features = false }
serde = { version = "1.0.130", features = [ "derive" ] }
serde_yaml = "0.8.21"
[features]
sdmmc-rs = ["embedded-sdmmc"]
@ -615,40 +613,40 @@ stm32h743xg = [ "stm32-metapac/stm32h743xg" ]
stm32h743xi = [ "stm32-metapac/stm32h743xi" ]
stm32h743zg = [ "stm32-metapac/stm32h743zg" ]
stm32h743zi = [ "stm32-metapac/stm32h743zi" ]
stm32h745bg_cm7 = [ "stm32-metapac/stm32h745bg_cm7" ]
stm32h745bg_cm4 = [ "stm32-metapac/stm32h745bg_cm4" ]
stm32h745bi_cm7 = [ "stm32-metapac/stm32h745bi_cm7" ]
stm32h745bi_cm4 = [ "stm32-metapac/stm32h745bi_cm4" ]
stm32h745ig_cm7 = [ "stm32-metapac/stm32h745ig_cm7" ]
stm32h745ig_cm4 = [ "stm32-metapac/stm32h745ig_cm4" ]
stm32h745ii_cm7 = [ "stm32-metapac/stm32h745ii_cm7" ]
stm32h745ii_cm4 = [ "stm32-metapac/stm32h745ii_cm4" ]
stm32h745xg_cm7 = [ "stm32-metapac/stm32h745xg_cm7" ]
stm32h745xg_cm4 = [ "stm32-metapac/stm32h745xg_cm4" ]
stm32h745xi_cm7 = [ "stm32-metapac/stm32h745xi_cm7" ]
stm32h745xi_cm4 = [ "stm32-metapac/stm32h745xi_cm4" ]
stm32h745zg_cm7 = [ "stm32-metapac/stm32h745zg_cm7" ]
stm32h745zg_cm4 = [ "stm32-metapac/stm32h745zg_cm4" ]
stm32h745zi_cm7 = [ "stm32-metapac/stm32h745zi_cm7" ]
stm32h745zi_cm4 = [ "stm32-metapac/stm32h745zi_cm4" ]
stm32h747ag_cm7 = [ "stm32-metapac/stm32h747ag_cm7" ]
stm32h747ag_cm4 = [ "stm32-metapac/stm32h747ag_cm4" ]
stm32h747ai_cm7 = [ "stm32-metapac/stm32h747ai_cm7" ]
stm32h747ai_cm4 = [ "stm32-metapac/stm32h747ai_cm4" ]
stm32h747bg_cm7 = [ "stm32-metapac/stm32h747bg_cm7" ]
stm32h747bg_cm4 = [ "stm32-metapac/stm32h747bg_cm4" ]
stm32h747bi_cm7 = [ "stm32-metapac/stm32h747bi_cm7" ]
stm32h747bi_cm4 = [ "stm32-metapac/stm32h747bi_cm4" ]
stm32h747ig_cm7 = [ "stm32-metapac/stm32h747ig_cm7" ]
stm32h747ig_cm4 = [ "stm32-metapac/stm32h747ig_cm4" ]
stm32h747ii_cm7 = [ "stm32-metapac/stm32h747ii_cm7" ]
stm32h747ii_cm4 = [ "stm32-metapac/stm32h747ii_cm4" ]
stm32h747xg_cm7 = [ "stm32-metapac/stm32h747xg_cm7" ]
stm32h747xg_cm4 = [ "stm32-metapac/stm32h747xg_cm4" ]
stm32h747xi_cm7 = [ "stm32-metapac/stm32h747xi_cm7" ]
stm32h747xi_cm4 = [ "stm32-metapac/stm32h747xi_cm4" ]
stm32h747zi_cm7 = [ "stm32-metapac/stm32h747zi_cm7" ]
stm32h747zi_cm4 = [ "stm32-metapac/stm32h747zi_cm4" ]
stm32h745bg-cm7 = [ "stm32-metapac/stm32h745bg-cm7" ]
stm32h745bg-cm4 = [ "stm32-metapac/stm32h745bg-cm4" ]
stm32h745bi-cm7 = [ "stm32-metapac/stm32h745bi-cm7" ]
stm32h745bi-cm4 = [ "stm32-metapac/stm32h745bi-cm4" ]
stm32h745ig-cm7 = [ "stm32-metapac/stm32h745ig-cm7" ]
stm32h745ig-cm4 = [ "stm32-metapac/stm32h745ig-cm4" ]
stm32h745ii-cm7 = [ "stm32-metapac/stm32h745ii-cm7" ]
stm32h745ii-cm4 = [ "stm32-metapac/stm32h745ii-cm4" ]
stm32h745xg-cm7 = [ "stm32-metapac/stm32h745xg-cm7" ]
stm32h745xg-cm4 = [ "stm32-metapac/stm32h745xg-cm4" ]
stm32h745xi-cm7 = [ "stm32-metapac/stm32h745xi-cm7" ]
stm32h745xi-cm4 = [ "stm32-metapac/stm32h745xi-cm4" ]
stm32h745zg-cm7 = [ "stm32-metapac/stm32h745zg-cm7" ]
stm32h745zg-cm4 = [ "stm32-metapac/stm32h745zg-cm4" ]
stm32h745zi-cm7 = [ "stm32-metapac/stm32h745zi-cm7" ]
stm32h745zi-cm4 = [ "stm32-metapac/stm32h745zi-cm4" ]
stm32h747ag-cm7 = [ "stm32-metapac/stm32h747ag-cm7" ]
stm32h747ag-cm4 = [ "stm32-metapac/stm32h747ag-cm4" ]
stm32h747ai-cm7 = [ "stm32-metapac/stm32h747ai-cm7" ]
stm32h747ai-cm4 = [ "stm32-metapac/stm32h747ai-cm4" ]
stm32h747bg-cm7 = [ "stm32-metapac/stm32h747bg-cm7" ]
stm32h747bg-cm4 = [ "stm32-metapac/stm32h747bg-cm4" ]
stm32h747bi-cm7 = [ "stm32-metapac/stm32h747bi-cm7" ]
stm32h747bi-cm4 = [ "stm32-metapac/stm32h747bi-cm4" ]
stm32h747ig-cm7 = [ "stm32-metapac/stm32h747ig-cm7" ]
stm32h747ig-cm4 = [ "stm32-metapac/stm32h747ig-cm4" ]
stm32h747ii-cm7 = [ "stm32-metapac/stm32h747ii-cm7" ]
stm32h747ii-cm4 = [ "stm32-metapac/stm32h747ii-cm4" ]
stm32h747xg-cm7 = [ "stm32-metapac/stm32h747xg-cm7" ]
stm32h747xg-cm4 = [ "stm32-metapac/stm32h747xg-cm4" ]
stm32h747xi-cm7 = [ "stm32-metapac/stm32h747xi-cm7" ]
stm32h747xi-cm4 = [ "stm32-metapac/stm32h747xi-cm4" ]
stm32h747zi-cm7 = [ "stm32-metapac/stm32h747zi-cm7" ]
stm32h747zi-cm4 = [ "stm32-metapac/stm32h747zi-cm4" ]
stm32h750ib = [ "stm32-metapac/stm32h750ib" ]
stm32h750vb = [ "stm32-metapac/stm32h750vb" ]
stm32h750xb = [ "stm32-metapac/stm32h750xb" ]
@ -659,24 +657,24 @@ stm32h753ii = [ "stm32-metapac/stm32h753ii" ]
stm32h753vi = [ "stm32-metapac/stm32h753vi" ]
stm32h753xi = [ "stm32-metapac/stm32h753xi" ]
stm32h753zi = [ "stm32-metapac/stm32h753zi" ]
stm32h755bi_cm7 = [ "stm32-metapac/stm32h755bi_cm7" ]
stm32h755bi_cm4 = [ "stm32-metapac/stm32h755bi_cm4" ]
stm32h755ii_cm7 = [ "stm32-metapac/stm32h755ii_cm7" ]
stm32h755ii_cm4 = [ "stm32-metapac/stm32h755ii_cm4" ]
stm32h755xi_cm7 = [ "stm32-metapac/stm32h755xi_cm7" ]
stm32h755xi_cm4 = [ "stm32-metapac/stm32h755xi_cm4" ]
stm32h755zi_cm7 = [ "stm32-metapac/stm32h755zi_cm7" ]
stm32h755zi_cm4 = [ "stm32-metapac/stm32h755zi_cm4" ]
stm32h757ai_cm7 = [ "stm32-metapac/stm32h757ai_cm7" ]
stm32h757ai_cm4 = [ "stm32-metapac/stm32h757ai_cm4" ]
stm32h757bi_cm7 = [ "stm32-metapac/stm32h757bi_cm7" ]
stm32h757bi_cm4 = [ "stm32-metapac/stm32h757bi_cm4" ]
stm32h757ii_cm7 = [ "stm32-metapac/stm32h757ii_cm7" ]
stm32h757ii_cm4 = [ "stm32-metapac/stm32h757ii_cm4" ]
stm32h757xi_cm7 = [ "stm32-metapac/stm32h757xi_cm7" ]
stm32h757xi_cm4 = [ "stm32-metapac/stm32h757xi_cm4" ]
stm32h757zi_cm7 = [ "stm32-metapac/stm32h757zi_cm7" ]
stm32h757zi_cm4 = [ "stm32-metapac/stm32h757zi_cm4" ]
stm32h755bi-cm7 = [ "stm32-metapac/stm32h755bi-cm7" ]
stm32h755bi-cm4 = [ "stm32-metapac/stm32h755bi-cm4" ]
stm32h755ii-cm7 = [ "stm32-metapac/stm32h755ii-cm7" ]
stm32h755ii-cm4 = [ "stm32-metapac/stm32h755ii-cm4" ]
stm32h755xi-cm7 = [ "stm32-metapac/stm32h755xi-cm7" ]
stm32h755xi-cm4 = [ "stm32-metapac/stm32h755xi-cm4" ]
stm32h755zi-cm7 = [ "stm32-metapac/stm32h755zi-cm7" ]
stm32h755zi-cm4 = [ "stm32-metapac/stm32h755zi-cm4" ]
stm32h757ai-cm7 = [ "stm32-metapac/stm32h757ai-cm7" ]
stm32h757ai-cm4 = [ "stm32-metapac/stm32h757ai-cm4" ]
stm32h757bi-cm7 = [ "stm32-metapac/stm32h757bi-cm7" ]
stm32h757bi-cm4 = [ "stm32-metapac/stm32h757bi-cm4" ]
stm32h757ii-cm7 = [ "stm32-metapac/stm32h757ii-cm7" ]
stm32h757ii-cm4 = [ "stm32-metapac/stm32h757ii-cm4" ]
stm32h757xi-cm7 = [ "stm32-metapac/stm32h757xi-cm7" ]
stm32h757xi-cm4 = [ "stm32-metapac/stm32h757xi-cm4" ]
stm32h757zi-cm7 = [ "stm32-metapac/stm32h757zi-cm7" ]
stm32h757zi-cm4 = [ "stm32-metapac/stm32h757zi-cm4" ]
stm32h7a3ag = [ "stm32-metapac/stm32h7a3ag" ]
stm32h7a3ai = [ "stm32-metapac/stm32h7a3ai" ]
stm32h7a3ig = [ "stm32-metapac/stm32h7a3ig" ]
@ -1066,10 +1064,10 @@ stm32wb55vc = [ "stm32-metapac/stm32wb55vc" ]
stm32wb55ve = [ "stm32-metapac/stm32wb55ve" ]
stm32wb55vg = [ "stm32-metapac/stm32wb55vg" ]
stm32wb55vy = [ "stm32-metapac/stm32wb55vy" ]
stm32wl55cc_cm4 = [ "stm32-metapac/stm32wl55cc_cm4" ]
stm32wl55cc_cm0p = [ "stm32-metapac/stm32wl55cc_cm0p" ]
stm32wl55jc_cm4 = [ "stm32-metapac/stm32wl55jc_cm4" ]
stm32wl55jc_cm0p = [ "stm32-metapac/stm32wl55jc_cm0p" ]
stm32wl55uc_cm4 = [ "stm32-metapac/stm32wl55uc_cm4" ]
stm32wl55uc_cm0p = [ "stm32-metapac/stm32wl55uc_cm0p" ]
stm32wl55cc-cm4 = [ "stm32-metapac/stm32wl55cc-cm4" ]
stm32wl55cc-cm0p = [ "stm32-metapac/stm32wl55cc-cm0p" ]
stm32wl55jc-cm4 = [ "stm32-metapac/stm32wl55jc-cm4" ]
stm32wl55jc-cm0p = [ "stm32-metapac/stm32wl55jc-cm0p" ]
stm32wl55uc-cm4 = [ "stm32-metapac/stm32wl55uc-cm4" ]
stm32wl55uc-cm0p = [ "stm32-metapac/stm32wl55uc-cm0p" ]
# END GENERATED FEATURES

View file

@ -8,7 +8,7 @@ resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] }
embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32wl55jc_cm4", "time-driver-tim2", "memory-x", "subghz", "unstable-pac"] }
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32wl55jc-cm4", "time-driver-tim2", "memory-x", "subghz", "unstable-pac"] }
embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time"] }

View file

@ -123,7 +123,7 @@ pub fn stm32_metapac_needed_data(names_and_cores: &[(String, Vec<String>)]) -> S
for (chip_name, cores) in names_and_cores {
if cores.len() > 1 {
for core_name in cores {
result += &format!("{}_{} = []\n", chip_name, core_name);
result += &format!("{}-{} = []\n", chip_name, core_name);
}
} else {
result += &format!("{} = []\n", chip_name);

View file

@ -1,30 +1,30 @@
use std::env;
use std::path::PathBuf;
fn main() {
let _chip_name = env::vars_os()
let crate_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
let chip_core_name = env::vars_os()
.map(|(a, _)| a.to_string_lossy().to_string())
.find(|x| x.starts_with("CARGO_FEATURE_STM32"))
.expect("No stm32xx Cargo feature enabled")
.strip_prefix("CARGO_FEATURE_")
.unwrap()
.to_ascii_lowercase();
.to_ascii_lowercase()
.replace('_', "-");
let mut s = chip_name.split('_');
let mut chip_name: String = s.next().unwrap().to_string();
if let Some(c) = s.next() {
if !c.starts_with("CM") {
chip_name.push('-');
} else {
chip_name.push('_');
}
chip_name.push_str(c);
}
println!(
"cargo:rustc-link-search={}/src/chips/{}",
crate_dir.display(),
chip_core_name,
);
#[cfg(feature = "memory-x")]
println!("cargo:rustc-link-search=src/chips/{}/memory_x/", _chip_name);
#[cfg(feature = "rt")]
println!("cargo:rustc-link-search=src/chips/{}", _chip_name);
println!(
"cargo:rustc-link-search={}/src/chips/{}/memory_x/",
crate_dir.display(),
chip_core_name,
);
println!("cargo:rerun-if-changed=build.rs");
}

View file

@ -0,0 +1,105 @@
use serde::Deserialize;
use std::collections::{BTreeMap, HashMap};
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
pub struct Chip {
pub name: String,
pub family: String,
pub line: String,
pub cores: Vec<Core>,
pub flash: Memory,
pub ram: Memory,
pub packages: Vec<Package>,
}
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
pub struct Memory {
pub bytes: u32,
pub regions: HashMap<String, MemoryRegion>,
}
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
pub struct MemoryRegion {
pub base: u32,
pub bytes: Option<u32>,
}
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
pub struct Core {
pub name: String,
pub peripherals: BTreeMap<String, Peripheral>,
pub interrupts: BTreeMap<String, u32>,
pub dma_channels: BTreeMap<String, DmaChannel>,
}
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
pub struct Package {
pub name: String,
pub package: String,
}
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
pub struct Peripheral {
pub address: u64,
#[serde(default)]
pub kind: Option<String>,
#[serde(default)]
pub block: Option<String>,
#[serde(default)]
pub clock: Option<String>,
#[serde(default)]
pub pins: Vec<Pin>,
#[serde(default)]
pub dma_channels: BTreeMap<String, Vec<PeripheralDmaChannel>>,
#[serde(default)]
pub interrupts: BTreeMap<String, String>,
}
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
pub struct Pin {
pub pin: String,
pub signal: String,
pub af: Option<String>,
}
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
pub struct DmaChannel {
pub dma: String,
pub channel: u32,
pub dmamux: Option<String>,
pub dmamux_channel: Option<u32>,
}
#[derive(Debug, Eq, PartialEq, Clone, Deserialize, Hash)]
pub struct PeripheralDmaChannel {
pub channel: Option<String>,
pub dmamux: Option<String>,
pub request: Option<u32>,
}
pub struct BlockInfo {
/// usart_v1/USART -> usart
pub module: String,
/// usart_v1/USART -> v1
pub version: String,
/// usart_v1/USART -> USART
pub block: String,
}
impl BlockInfo {
pub fn parse(s: &str) -> Self {
let mut s = s.split('/');
let module = s.next().unwrap();
let block = s.next().unwrap();
assert!(s.next().is_none());
let mut s = module.split('_');
let module = s.next().unwrap();
let version = s.next().unwrap();
assert!(s.next().is_none());
Self {
module: module.to_string(),
version: version.to_string(),
block: block.to_string(),
}
}
}

File diff suppressed because it is too large Load diff

View file

@ -17,7 +17,6 @@ fn main() {
.unwrap()
.filter_map(|res| res.unwrap().file_name().to_str().map(|s| s.to_string()))
.filter(|s| s.ends_with(".yaml"))
.filter(|s| !s.starts_with("STM32L1")) // cursed gpio stride
.filter(|s| !s.starts_with("STM32GBK")) // cursed weird STM32G4
.map(|s| s.strip_suffix(".yaml").unwrap().to_string())
.collect()

View file

@ -16,6 +16,13 @@ regex = "1.5.4"
# END BUILD DEPENDENCIES
[features]
default = ["pac"]
# Build the actual PAC. Set by default.
# If not set, only the macrotables will be generated. You may want to not set it
# if you're using stm32-metapac from a build.rs script to use the macros.
pac = []
rt = ["cortex-m-rt/device"]
memory-x = []
@ -780,40 +787,40 @@ stm32h743xg = []
stm32h743xi = []
stm32h743zg = []
stm32h743zi = []
stm32h745bg_cm7 = []
stm32h745bg_cm4 = []
stm32h745bi_cm7 = []
stm32h745bi_cm4 = []
stm32h745ig_cm7 = []
stm32h745ig_cm4 = []
stm32h745ii_cm7 = []
stm32h745ii_cm4 = []
stm32h745xg_cm7 = []
stm32h745xg_cm4 = []
stm32h745xi_cm7 = []
stm32h745xi_cm4 = []
stm32h745zg_cm7 = []
stm32h745zg_cm4 = []
stm32h745zi_cm7 = []
stm32h745zi_cm4 = []
stm32h747ag_cm7 = []
stm32h747ag_cm4 = []
stm32h747ai_cm7 = []
stm32h747ai_cm4 = []
stm32h747bg_cm7 = []
stm32h747bg_cm4 = []
stm32h747bi_cm7 = []
stm32h747bi_cm4 = []
stm32h747ig_cm7 = []
stm32h747ig_cm4 = []
stm32h747ii_cm7 = []
stm32h747ii_cm4 = []
stm32h747xg_cm7 = []
stm32h747xg_cm4 = []
stm32h747xi_cm7 = []
stm32h747xi_cm4 = []
stm32h747zi_cm7 = []
stm32h747zi_cm4 = []
stm32h745bg-cm7 = []
stm32h745bg-cm4 = []
stm32h745bi-cm7 = []
stm32h745bi-cm4 = []
stm32h745ig-cm7 = []
stm32h745ig-cm4 = []
stm32h745ii-cm7 = []
stm32h745ii-cm4 = []
stm32h745xg-cm7 = []
stm32h745xg-cm4 = []
stm32h745xi-cm7 = []
stm32h745xi-cm4 = []
stm32h745zg-cm7 = []
stm32h745zg-cm4 = []
stm32h745zi-cm7 = []
stm32h745zi-cm4 = []
stm32h747ag-cm7 = []
stm32h747ag-cm4 = []
stm32h747ai-cm7 = []
stm32h747ai-cm4 = []
stm32h747bg-cm7 = []
stm32h747bg-cm4 = []
stm32h747bi-cm7 = []
stm32h747bi-cm4 = []
stm32h747ig-cm7 = []
stm32h747ig-cm4 = []
stm32h747ii-cm7 = []
stm32h747ii-cm4 = []
stm32h747xg-cm7 = []
stm32h747xg-cm4 = []
stm32h747xi-cm7 = []
stm32h747xi-cm4 = []
stm32h747zi-cm7 = []
stm32h747zi-cm4 = []
stm32h750ib = []
stm32h750vb = []
stm32h750xb = []
@ -824,24 +831,24 @@ stm32h753ii = []
stm32h753vi = []
stm32h753xi = []
stm32h753zi = []
stm32h755bi_cm7 = []
stm32h755bi_cm4 = []
stm32h755ii_cm7 = []
stm32h755ii_cm4 = []
stm32h755xi_cm7 = []
stm32h755xi_cm4 = []
stm32h755zi_cm7 = []
stm32h755zi_cm4 = []
stm32h757ai_cm7 = []
stm32h757ai_cm4 = []
stm32h757bi_cm7 = []
stm32h757bi_cm4 = []
stm32h757ii_cm7 = []
stm32h757ii_cm4 = []
stm32h757xi_cm7 = []
stm32h757xi_cm4 = []
stm32h757zi_cm7 = []
stm32h757zi_cm4 = []
stm32h755bi-cm7 = []
stm32h755bi-cm4 = []
stm32h755ii-cm7 = []
stm32h755ii-cm4 = []
stm32h755xi-cm7 = []
stm32h755xi-cm4 = []
stm32h755zi-cm7 = []
stm32h755zi-cm4 = []
stm32h757ai-cm7 = []
stm32h757ai-cm4 = []
stm32h757bi-cm7 = []
stm32h757bi-cm4 = []
stm32h757ii-cm7 = []
stm32h757ii-cm4 = []
stm32h757xi-cm7 = []
stm32h757xi-cm4 = []
stm32h757zi-cm7 = []
stm32h757zi-cm4 = []
stm32h7a3ag = []
stm32h7a3ai = []
stm32h7a3ig = []
@ -1255,16 +1262,16 @@ stm32wb55ve = []
stm32wb55vg = []
stm32wb55vy = []
stm32wb5mmg = []
stm32wl54cc_cm4 = []
stm32wl54cc_cm0p = []
stm32wl54jc_cm4 = []
stm32wl54jc_cm0p = []
stm32wl55cc_cm4 = []
stm32wl55cc_cm0p = []
stm32wl55jc_cm4 = []
stm32wl55jc_cm0p = []
stm32wl55uc_cm4 = []
stm32wl55uc_cm0p = []
stm32wl54cc-cm4 = []
stm32wl54cc-cm0p = []
stm32wl54jc-cm4 = []
stm32wl54jc-cm0p = []
stm32wl55cc-cm4 = []
stm32wl55cc-cm0p = []
stm32wl55jc-cm4 = []
stm32wl55jc-cm0p = []
stm32wl55uc-cm4 = []
stm32wl55uc-cm0p = []
stm32wle4c8 = []
stm32wle4cb = []
stm32wle4cc = []

View file

@ -2,48 +2,52 @@ use std::env;
use std::path::PathBuf;
use stm32_metapac_gen::*;
fn parse_chip_core(chip_and_core: &str) -> (String, Option<String>) {
let mut s = chip_and_core.split('-');
let chip_name: String = s.next().unwrap().to_string();
if let Some(c) = s.next() {
if c.starts_with("CM") {
return (chip_name, Some(c.to_ascii_lowercase()));
}
}
(chip_and_core.to_string(), None)
}
fn main() {
let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
let data_dir = PathBuf::from("../stm32-data/data");
println!("cwd: {:?}", env::current_dir());
let chip_name = env::vars_os()
let chip_core_name = env::vars_os()
.map(|(a, _)| a.to_string_lossy().to_string())
.find(|x| x.starts_with("CARGO_FEATURE_STM32"))
.expect("No stm32xx Cargo feature enabled")
.strip_prefix("CARGO_FEATURE_")
.unwrap()
.to_ascii_uppercase();
.to_ascii_uppercase()
.replace('_', "-");
let (chip_name, _) = parse_chip_core(&chip_core_name);
gen(Options {
out_dir: out_dir.clone(),
data_dir: data_dir.clone(),
chips: vec![chip_name.clone()],
chips: vec![chip_name],
});
let mut s = chip_name.split('_');
let mut chip_name: String = s.next().unwrap().to_string();
if let Some(c) = s.next() {
if !c.starts_with("CM") {
chip_name.push('-');
} else {
chip_name.push('_');
}
chip_name.push_str(c);
}
println!(
"cargo:rustc-link-search={}/src/chips/{}",
out_dir.display(),
chip_name.to_ascii_lowercase()
chip_core_name.to_ascii_lowercase()
);
#[cfg(feature = "memory-x")]
println!(
"cargo:rustc-link-search={}/src/chips/{}/memory_x/",
out_dir.display(),
chip_name.to_ascii_lowercase()
chip_core_name.to_ascii_lowercase()
);
println!("cargo:rerun-if-changed=build.rs");