Skip to content

feat(cpn): SBUS trainer support on serial inputs on H5/H7 release 2.12 #7142

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

Open
elecpower wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(cpn): SBUS trainer support on serial inputs on H5/H7 release 2.12 #7142

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
1 change: 1 addition & 0 deletions companion/src/firmwares/edgetx/yaml_generalsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ const YamlLookupTable uartModeLut = {
{ GeneralSettings::AUX_SERIAL_TELE_MIRROR, "TELEMETRY_MIRROR" },
{ GeneralSettings::AUX_SERIAL_TELE_IN, "TELEMETRY_IN" },
{ GeneralSettings::AUX_SERIAL_SBUS_TRAINER, "SBUS_TRAINER" },
{ GeneralSettings::AUX_SERIAL_SBUS_TRAINER_INV, "SBUS_TRAINER_INV" },
{ GeneralSettings::AUX_SERIAL_LUA, "LUA" },
{ GeneralSettings::AUX_SERIAL_CLI, "CLI" },
{ GeneralSettings::AUX_SERIAL_GPS, "GPS" },
Expand Down
17 changes: 10 additions & 7 deletions companion/src/firmwares/generalsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,8 @@ QString GeneralSettings::serialModeToString(int value)
return tr("Telemetry In");
case AUX_SERIAL_SBUS_TRAINER:
return tr("SBUS Trainer");
case AUX_SERIAL_SBUS_TRAINER_INV:
return tr("SBUS Trainer Inverted");
case AUX_SERIAL_LUA:
return tr("LUA");
case AUX_SERIAL_CLI:
Expand Down Expand Up @@ -606,16 +608,17 @@ AbstractStaticItemModel * GeneralSettings::serialModeItemModel()

if (i == AUX_SERIAL_EXT_MODULE) {
contexts &= ~(AUX2Context | VCPContext);
}
else if (i == AUX_SERIAL_TELE_IN ||
i == AUX_SERIAL_SBUS_TRAINER ||
i == AUX_SERIAL_GPS ||
i == AUX_SERIAL_SPACEMOUSE ||
i == AUX_SERIAL_EXT_MODULE) {
} else if (i == AUX_SERIAL_TELE_IN ||
i == AUX_SERIAL_SBUS_TRAINER ||
i == AUX_SERIAL_SBUS_TRAINER_INV ||
i == AUX_SERIAL_GPS ||
i == AUX_SERIAL_SPACEMOUSE ||
i == AUX_SERIAL_EXT_MODULE) {
contexts &= ~VCPContext;
}

mdl->appendToItemList(serialModeToString(i), i, true, 0, contexts);
bool avail = IS_STM32F2F4(getCurrentBoard()) && i == AUX_SERIAL_SBUS_TRAINER_INV ? false : true;
mdl->appendToItemList(serialModeToString(i), i, avail, 0, contexts);
}

mdl->loadItemList();
Expand Down
1 change: 1 addition & 0 deletions companion/src/firmwares/generalsettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ class GeneralSettings {
AUX_SERIAL_TELE_MIRROR,
AUX_SERIAL_TELE_IN,
AUX_SERIAL_SBUS_TRAINER,
AUX_SERIAL_SBUS_TRAINER_INV,
AUX_SERIAL_LUA,
AUX_SERIAL_CLI,
AUX_SERIAL_GPS,
Expand Down
6 changes: 4 additions & 2 deletions companion/src/firmwares/modeldata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1838,8 +1838,10 @@ bool ModelData::isTrainerModeAvailable(const GeneralSettings & generalSettings,
return false;

if (value == TRAINER_MODE_MASTER_SERIAL &&
(generalSettings.serialPort[GeneralSettings::SP_AUX1] != GeneralSettings::AUX_SERIAL_SBUS_TRAINER &&
generalSettings.serialPort[GeneralSettings::SP_AUX2] != GeneralSettings::AUX_SERIAL_SBUS_TRAINER))
generalSettings.serialPort[GeneralSettings::SP_AUX1] != GeneralSettings::AUX_SERIAL_SBUS_TRAINER &&
generalSettings.serialPort[GeneralSettings::SP_AUX1] != GeneralSettings::AUX_SERIAL_SBUS_TRAINER_INV &&
generalSettings.serialPort[GeneralSettings::SP_AUX2] != GeneralSettings::AUX_SERIAL_SBUS_TRAINER &&
generalSettings.serialPort[GeneralSettings::SP_AUX2] != GeneralSettings::AUX_SERIAL_SBUS_TRAINER_INV)
return false;

if ((value == TRAINER_MODE_MASTER_BLUETOOTH || value == TRAINER_MODE_SLAVE_BLUETOOTH) &&
Expand Down