Skip to content
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

chore: remove discrepancy in x10/x7 naming #5254

Merged
merged 3 commits into from
Jul 6, 2024
Merged

chore: remove discrepancy in x10/x7 naming #5254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb7188c
chore: remove discrepancy in x10 namings
Jul 6, 2024
0869715
Update fw.json
3djc Jul 6, 2024
b7f0735
chore: x7-access to x7access for consistency with flavour too
Jul 6, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
- tx12;tx12mk2;boxer
- tx16s
- f16
- x10;x10-access
- x10;x10express
- x12s
- x7;x7-access
- x9d;x9dp;x9dp2019
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- tx12;tx12mk2;boxer
- tx16s
- f16
- x10;x10-access
- x10;x10express
- x12s
- x7;x7-access
- x9d;x9dp;x9dp2019
Expand Down
2 changes: 1 addition & 1 deletion companion/src/firmwares/opentx/opentxinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion fw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
["Flysky PL18", "pl18-"],
["Flysky PL18EV", "pl18ev-"],
["FrSky Horus X10", "x10-"],
["FrSky Horus X10 Access", "x10-access-"],
["FrSky Horus X10 Access", "x10express-"],
3djc marked this conversation as resolved.
Show resolved Hide resolved
["FrSky Horus X12s", "x12s-"],
["FrSky QX7", "x7-"],
["FrSky QX7 Access", "x7-access-"],
pfeerick marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
4 changes: 2 additions & 2 deletions tools/build-companion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ declare -a simulator_plugins=(x9lite x9lites
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[@]}"
Expand Down Expand Up @@ -158,7 +158,7 @@ do
x10)
BUILD_OPTIONS+="-DPCB=X10"
;;
x10-access)
x10express)
BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=EXPRESS -DPXX1=YES"
;;
x12s)
Expand Down
2 changes: 1 addition & 1 deletion tools/build-gh.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ do
x10)
BUILD_OPTIONS+="-DPCB=X10"
;;
x10-access)
x10express)
BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=EXPRESS -DPXX1=YES"
;;
x12s)
Expand Down
4 changes: 2 additions & 2 deletions tools/commit-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tools/generate-hw-defs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;x7-access;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
Expand Down Expand Up @@ -102,7 +102,7 @@ do
x10)
BUILD_OPTIONS+="-DPCB=X10"
;;
x10-access)
x10express)
BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=EXPRESS -DPXX1=YES"
;;
x12s)
Expand Down
2 changes: 1 addition & 1 deletion tools/generate-yaml.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ do
x10)
BUILD_OPTIONS+="-DPCB=X10"
;;
x10-access)
x10express)
BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=EXPRESS -DPXX1=YES"
;;
x12s)
Expand Down
4 changes: 2 additions & 2 deletions tools/msys2_fetch_and_build_all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|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 BUILD_OPTIONS="-DDEFAULT_MODE=2 -DGVARS=YES"

Expand Down Expand Up @@ -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)
Expand Down
Loading