Skip to content

fix(ch32v): map V006 to M00X system#1112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zackees merged 1 commit into from
Jul 21, 2026
Merged

fix(ch32v): map V006 to M00X system #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 7 additions & 34 deletions crates/fbuild-build-mcu/src/ch32v/orchestrator.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -306,20 +306,6 @@ fn resolve_variant_dir(
requested_variant: &str,
system_series: &str,
) -> PathBuf {
// OpenWCH d767162 adds CH32VM00X/CH32V006K8, but that variant currently
// references PB_* pins not defined by the CH32V006 build. Before that
// upstream directory existed, fbuild built this board with the CH32V003F4
// family fallback; keep that known-good path for the pinned core.
if requested_variant == "CH32VM00X/CH32V006K8" {
let fallback = framework_dir
.join("variants")
.join("CH32V00x")
.join("CH32V003F4");
if fallback.is_dir() {
return fallback;
}
}

let requested = framework_dir.join("variants").join(requested_variant);
if requested.is_dir() {
return requested;
Expand DownExpand Up@@ -355,6 +341,12 @@ fn resolve_variant_dir(
/// Map a series name to the system directory name in the OpenWCH core.
/// e.g. "ch32v003" -> "CH32V00x", "ch32l103" -> "CH32L10x", "ch32x035" -> "CH32X035"
fn series_to_system_dir(series: &str) -> String {
if matches!(
series,
"ch32v002" | "ch32v004" | "ch32v005" | "ch32v006" | "ch32v007" | "ch32m007"
) {
return "CH32VM00X".to_string();
}
let upper = series.to_uppercase();
if upper.len() >= 7 {
// CH32V/CH32L series use the "replace last digit with x" family
Expand DownExpand Up@@ -416,6 +408,7 @@ mod tests {
fn test_series_to_system_dir() {
// CH32V series: last digit replaced with 'x'
assert_eq!(series_to_system_dir("ch32v003"), "CH32V00x");
assert_eq!(series_to_system_dir("ch32v006"), "CH32VM00X");
assert_eq!(series_to_system_dir("ch32v103"), "CH32V10x");
assert_eq!(series_to_system_dir("ch32v203"), "CH32V20x");
assert_eq!(series_to_system_dir("ch32v303"), "CH32V30x");
Expand All@@ -440,26 +433,6 @@ mod tests {
assert_eq!(resolved, fallback);
}

#[test]
fn test_resolve_variant_dir_skips_broken_ch32v006_upstream_variant() {
let tmp = tempdir();
let requested = tmp
.path()
.join("variants")
.join("CH32VM00X")
.join("CH32V006K8");
let fallback = tmp
.path()
.join("variants")
.join("CH32V00x")
.join("CH32V003F4");
std::fs::create_dir_all(&requested).unwrap();
std::fs::create_dir_all(&fallback).unwrap();

let resolved = resolve_variant_dir(tmp.path(), "CH32VM00X/CH32V006K8", "CH32V00x");
assert_eq!(resolved, fallback);
}

#[test]
fn test_resolve_variant_h_ignores_missing_preferred_header() {
let tmp = tempdir();
Expand Down
2 changes: 1 addition & 1 deletion crates/fbuild-config/assets/boards/json/genericCH32V006K8U6.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
},
"clock_source": "hsi+pll",
"core": "openwch",
"extra_flags": "-DCH32V006K8 -DCH32VM0X -DCH32VM0x -DCH32V006",
"extra_flags": "-DCH32V006K8 -DCH32VM00X -DCH32VM00x -DCH32V006",
"f_cpu": "48000000L",
"mabi": "ilp32e",
"march": "rv32ec_zicsr",
Expand Down
Loading