stm32: rename core features from _cmX to -cmX, cleanup gen.

stm32-metapac/Cargo.toml

@@ -780,40 +780,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 +824,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 +1255,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 = []

stm32-metapac/build.rs

@@ -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");