From 04f83083f0ac524eacb71ee59b2cb81f78a73f7b Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sun, 30 Aug 2026 08:56:15 +1000 Subject: [PATCH] refactor: remove redundant x9e-hall target entry (#7723) Co-authored-by: Peter Feerick <5500713+pfeerick@users.noreply.github.com> Co-authored-by: GitHub Copilot --- .github/workflows/build_fw.yml | 2 +- .github/workflows/nightly.yml | 2 +- fw.json | 1 - tools/build-common.sh | 3 --- web/README.md | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_fw.yml b/.github/workflows/build_fw.yml index 829a4378a..9df8b9555 100644 --- a/.github/workflows/build_fw.yml +++ b/.github/workflows/build_fw.yml @@ -92,7 +92,7 @@ jobs: - x12s;f16 - v14;v14lcd;v16 - x10;x10express - - x7access;x9dp2019;x9e;x9e-hall + - x7access;x9dp2019;x9e - nb4p;st16 - tx16smk3;t14;t15pro - t22 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b249f685b..fe5df4bb1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -33,7 +33,7 @@ jobs: - x12s - x7access - x9dp2019 - - x9e;x9e-hall + - x9e - mt12 - nb4p - st16 diff --git a/fw.json b/fw.json index e6a49af66..f3429d00f 100644 --- a/fw.json +++ b/fw.json @@ -15,7 +15,6 @@ ["FrSky QX7 Access", "x7access-"], ["FrSky X9D Plus 2019", "x9dp2019-"], ["FrSky X9E", "x9e-"], - ["FrSky X9E Hall", "x9e-hall-"], ["HelloRadioSky V12", "v12-"], ["HelloRadioSky V14", "v14-"], ["HelloRadioSky V14LCD", "v14lcd-"], diff --git a/tools/build-common.sh b/tools/build-common.sh index f32c68f9f..366401cc6 100644 --- a/tools/build-common.sh +++ b/tools/build-common.sh @@ -92,9 +92,6 @@ get_target_build_options() { x9e) BUILD_OPTIONS+="-DPCB=X9E" ;; - x9e-hall) - BUILD_OPTIONS+="-DPCB=X9E -DSTICKS=HORUS" - ;; x10) BUILD_OPTIONS+="-DPCB=X10" ;; diff --git a/web/README.md b/web/README.md index 3d2f43593..64bb3eab7 100644 --- a/web/README.md +++ b/web/README.md @@ -52,7 +52,7 @@ node web/scripts/gen-radios-json.js The script extracts inputs, switches, trims, keys, and display info from the hw_defs JSON files. Key left/right side placement matches Companion's layout. -*Which* radios are included comes from the `targets` list in the repo-root `fw.json`, so a new board only appears here once it is a released target. Targets with no matching hw_defs file are skipped with a warning: `x9e-hall` always warns, as it is a build option of `x9e` rather than a board of its own. +*Which* radios are included comes from the `targets` list in the repo-root `fw.json`, so a new board only appears here once it is a released target. Passing flavour names as arguments limits generation to those radios only — the whole file is rewritten, so use that for inspection, not to update the committed list.