diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 5bf57f48936..b24060010ee 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -105,9 +105,9 @@ jobs: - tx12;tx12mk2;boxer - tx16s - f16 - - x10;x10-access + - x10;x10express - x12s - - x7;x7-access + - x7;x7access - x9d;x9dp;x9dp2019 - x9e;x9e-hall - x9lite;x9lites diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 85b3503a83d..1707e2a56a2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -26,9 +26,9 @@ jobs: - tx12;tx12mk2;boxer - tx16s - f16 - - x10;x10-access + - x10;x10express - x12s - - x7;x7-access + - x7;x7access - x9d;x9dp;x9dp2019 - x9e;x9e-hall - x9lite;x9lites diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 2c1448b11e0..3809c52069d 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -1306,7 +1306,7 @@ void registerOpenTxFirmwares() addOpenTxRfOptions(firmware, EU + FLEX); /* FrSky Horus X10 Express board */ - firmware = new OpenTxFirmware(FIRMWAREID("x10express"), Firmware::tr("FrSky Horus X10 Express / X10S Express"), BOARD_X10_EXPRESS, "x10-access"); + firmware = new OpenTxFirmware(FIRMWAREID("x10express"), Firmware::tr("FrSky Horus X10 Express / X10S Express"), BOARD_X10_EXPRESS, "x10express"); addOpenTxFrskyOptions(firmware); registerOpenTxFirmware(firmware); addOpenTxRfOptions(firmware, FLEX); @@ -1326,7 +1326,7 @@ void registerOpenTxFirmwares() addOpenTxRfOptions(firmware, EU + FLEX); /* FrSky Taranis X7 Access board */ - firmware = new OpenTxFirmware(FIRMWAREID("x7access"), Firmware::tr("FrSky Taranis X7 / X7S Access"), BOARD_TARANIS_X7_ACCESS, "x7-access"); + firmware = new OpenTxFirmware(FIRMWAREID("x7access"), Firmware::tr("FrSky Taranis X7 / X7S Access"), BOARD_TARANIS_X7_ACCESS, "x7access"); addOpenTxTaranisOptions(firmware); registerOpenTxFirmware(firmware); addOpenTxRfOptions(firmware, FLEX); diff --git a/fw.json b/fw.json index 1c5aa146d8b..dcb5a8c8a27 100644 --- a/fw.json +++ b/fw.json @@ -7,10 +7,10 @@ ["Flysky PL18", "pl18-"], ["Flysky PL18EV", "pl18ev-"], ["FrSky Horus X10", "x10-"], - ["FrSky Horus X10 Access", "x10-access-"], + ["FrSky Horus X10 Express", "x10express-"], ["FrSky Horus X12s", "x12s-"], ["FrSky QX7", "x7-"], - ["FrSky QX7 Access", "x7-access-"], + ["FrSky QX7 Access", "x7access-"], ["FrSky X9D", "x9d-"], ["FrSky X9D Plus", "x9dp-"], ["FrSky X9D Plus 2019", "x9dp2019-"], diff --git a/tools/build-companion.sh b/tools/build-companion.sh index 074c2ff81e0..cb8520973e2 100755 --- a/tools/build-companion.sh +++ b/tools/build-companion.sh @@ -64,14 +64,14 @@ mkdir build cd build declare -a simulator_plugins=(x9lite x9lites - x7 x7-access + x7 x7access t8 t12 tx12 tx12mk2 zorro commando8 boxer pocket tlite tpro tprov2 lr3pro t14 x9d x9dp x9dp2019 x9e xlite xlites nv14 el18 pl18 pl18ev - x10 x10-access x12s + x10 x10express x12s t15 t16 t18 t20 t20v2 tx16s f16) for plugin in "${simulator_plugins[@]}" @@ -89,7 +89,7 @@ do x7) BUILD_OPTIONS+="-DPCB=X7" ;; - x7-access) + x7access) BUILD_OPTIONS+="-DPCB=X7 -DPCBREV=ACCESS -DPXX1=YES" ;; t12) @@ -158,7 +158,7 @@ do x10) BUILD_OPTIONS+="-DPCB=X10" ;; - x10-access) + x10express) BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=EXPRESS -DPXX1=YES" ;; x12s) diff --git a/tools/build-gh.sh b/tools/build-gh.sh index 784cc6c15f2..15cd0d9c20b 100755 --- a/tools/build-gh.sh +++ b/tools/build-gh.sh @@ -101,7 +101,7 @@ do x7) BUILD_OPTIONS+="-DPCB=X7" ;; - x7-access) + x7access) BUILD_OPTIONS+="-DPCB=X7 -DPCBREV=ACCESS -DPXX1=YES" ;; t12) @@ -176,7 +176,7 @@ do x10) BUILD_OPTIONS+="-DPCB=X10" ;; - x10-access) + x10express) BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=EXPRESS -DPXX1=YES" ;; x12s) diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh index e4b40856222..6335703c595 100755 --- a/tools/commit-tests.sh +++ b/tools/commit-tests.sh @@ -79,7 +79,7 @@ do x7) BUILD_OPTIONS+="-DPCB=X7" ;; - x7-access) + x7access) BUILD_OPTIONS+="-DPCB=X7 -DPCBREV=ACCESS -DPXX1=YES" ;; t12) @@ -136,8 +136,8 @@ do x10) BUILD_OPTIONS+="-DPCB=X10" ;; - x10-access) - BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=ACCESS -DPXX1=YES" + x10express) + BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=EXPRESS -DPXX1=YES" ;; x12s) BUILD_OPTIONS+="-DPCB=X12S" diff --git a/tools/generate-hw-defs.sh b/tools/generate-hw-defs.sh index 48aeaa63fe0..98aec4a60b9 100755 --- a/tools/generate-hw-defs.sh +++ b/tools/generate-hw-defs.sh @@ -6,7 +6,7 @@ set -e : "${SRCDIR:=$(dirname "$(pwd)/$0")/..}" -: ${FLAVOR:="nv14;t12;t15;t16;t18;t8;zorro;pocket;commando8;tlite;tpro;tprov2;t20;t20v2;t14;lr3pro;mt12;tx12;tx12mk2;boxer;tx16s;x10;x10-access;x12s;x7;x7-access;x9d;x9dp;x9dp2019;x9e;x9lite;x9lites;xlite;xlites"} +: ${FLAVOR:="nv14;t12;t15;t16;t18;t8;zorro;pocket;commando8;tlite;tpro;tprov2;t20;t20v2;t14;lr3pro;mt12;tx12;tx12mk2;boxer;tx16s;x10;x10express;x12s;x7;x7access;x9d;x9dp;x9dp2019;x9e;x9lite;x9lites;xlite;xlites"} : ${COMMON_OPTIONS:="-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_RULE_MESSAGES=OFF -Wno-dev -DCMAKE_MESSAGE_LOG_LEVEL=WARNING"} # wipe build directory clean @@ -33,7 +33,7 @@ do x7) BUILD_OPTIONS+="-DPCB=X7" ;; - x7-access) + x7access) BUILD_OPTIONS+="-DPCB=X7 -DPCBREV=ACCESS -DPXX1=YES" ;; t12) @@ -102,7 +102,7 @@ do x10) BUILD_OPTIONS+="-DPCB=X10" ;; - x10-access) + x10express) BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=EXPRESS -DPXX1=YES" ;; x12s) diff --git a/tools/generate-yaml.sh b/tools/generate-yaml.sh index 42b114fe60f..2f9857c5f34 100755 --- a/tools/generate-yaml.sh +++ b/tools/generate-yaml.sh @@ -35,7 +35,7 @@ do x7) BUILD_OPTIONS+="-DPCB=X7" ;; - x7-access) + x7access) BUILD_OPTIONS+="-DPCB=X7 -DPCBREV=ACCESS -DPXX1=YES" ;; t12) @@ -101,7 +101,7 @@ do x10) BUILD_OPTIONS+="-DPCB=X10" ;; - x10-access) + x10express) BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=EXPRESS -DPXX1=YES" ;; x12s) diff --git a/tools/msys2_fetch_and_build_all.sh b/tools/msys2_fetch_and_build_all.sh index b444a245eb3..6c26d902546 100644 --- a/tools/msys2_fetch_and_build_all.sh +++ b/tools/msys2_fetch_and_build_all.sh @@ -9,7 +9,7 @@ # ----------------------------------------------------------------------------- export BRANCH_NAME="main" # main|2.9|... -export RADIO_TYPE="tx16s" # tx16s|x10|x10-access|x12s|x9d|x9dp|x9lite|x9lites|x7|x7-access|t12|tx12|tx12mk2|mt12|boxer|t8|zorro|pocket|tlite|tpro|t20|t20v2|t14|lr3pro|xlite|xlites|x9dp2019|x9e|x9e-hall|t15|t16|t18|nv14|commando8 +export RADIO_TYPE="tx16s" # tx16s|x10|x10express|x12s|x9d|x9dp|x9lite|x9lites|x7|x7access|t12|tx12|tx12mk2|mt12|boxer|t8|zorro|pocket|tlite|tpro|t20|t20v2|t14|lr3pro|xlite|xlites|x9dp2019|x9e|x9e-hall|t15|t16|t18|nv14|commando8 export BUILD_OPTIONS="-DDEFAULT_MODE=2 -DGVARS=YES" @@ -24,7 +24,7 @@ case $RADIO_TYPE in x7) BUILD_OPTIONS+=" -DPCB=X7" ;; - x7-access) + x7access) BUILD_OPTIONS+=" -DPCB=X7 -DPCBREV=ACCESS -DPXX1=YES" ;; t12) @@ -93,7 +93,7 @@ case $RADIO_TYPE in x10) BUILD_OPTIONS+=" -DPCB=X10" ;; - x10-access) + x10express) BUILD_OPTIONS+=" -DPCB=X10 -DPCBREV=EXPRESS -DPXX1=YES" ;; x12s)