Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions generator/src/commands/generate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,19 @@ fn generate_chip(current_dir: &Path, feature: &ChipDescription) -> anyhow::Resul
for core in feature.cores {
let chips_dir = pac_dir.join("src").join("chips");

let metadata = match feature.metadata {
Some(metadata_file) => Some(
crate::metadata::generate(
&chips_dir,
&metadata_dir.join(metadata_file).with_extension("json"),
core,
)
.context("Generating metadata")?,
),
None => None,
};

if feature.metapac {
let metadata = match feature.metadata {
Some(metadata_file) => Some(
crate::metadata::generate(
&chips_dir,
&metadata_dir.join(metadata_file).with_extension("json"),
core,
)
.context("Generating metadata")?,
),
None => None,
};

let Some(metadata) = metadata else {
bail!("Metadata should not be empty when using metapac");
};
Expand All @@ -94,6 +94,15 @@ fn generate_chip(current_dir: &Path, feature: &ChipDescription) -> anyhow::Resul
info!("Generating {}/{}", feature.chip, core);
crate::pac::generate_core(&svd, &chips_dir, &transforms_dir, core)
.context("Generating PAC")?;

if let Some(metadata_file) = feature.metadata {
crate::metadata::generate(
&chips_dir,
&metadata_dir.join(metadata_file).with_extension("json"),
core,
)
.context("Generating metadata")?;
}
}
}

Expand Down
Loading