piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Companion no longer implies will convert if profile mismatch on read + add board parameter if missing (#1572)

Browse Source
This commit is contained in:
Neil Horne
2022-02-08 11:17:32 +10:00
committed by GitHub
parent 035bd391fb
commit ba93abc30c
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/edgetx/yaml_generalsettings.cpp
+12 -8
View File
@@ -241,17 +241,21 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
node["board"] >> flavour;
auto fw = getCurrentFirmware();
auto msfw = Firmware::getFirmwareForFlavour(QString(flavour.c_str()));
if (flavour.empty()) {
qDebug() << "Warning: Settings file does not contain board flavour! Default firmware board will be used";
flavour = msfw->getFlavour().toStdString();
}
qDebug() << "Settings version:" << rhs.version << "File flavour:" << flavour.c_str() << "Firmware flavour:" << fw->getFlavour();
if (fw->getFlavour().toStdString() != flavour) {
QString prmpt = QCoreApplication::translate("YamlGeneralSettings", "File board (%1) does not match current profile board (%2), models and settings will be converted where possible.\n\nDo you wish to continue?").arg(Boards::getBoardName(msfw->getBoard())).arg(Boards::getBoardName(fw->getBoard()));
if (flavour.empty()) {
QString prmpt = QCoreApplication::translate("YamlGeneralSettings", "Warning: Radio settings file is missing the board entry!\n\nCurrent firmware profile board will be used.\n\nDo you wish to continue?");
if (QMessageBox::question(NULL, CPN_STR_APP_NAME, prmpt, (QMessageBox::Yes | QMessageBox::No), QMessageBox::No) != QMessageBox::Yes) {
// TODO: this triggers an error in the calling code so we need a graceful way to handle
return false;
}
flavour = fw->getFlavour().toStdString();
}
else if (fw->getFlavour().toStdString() != flavour) {
auto msfw = Firmware::getFirmwareForFlavour(QString(flavour.c_str()));
QString prmpt = QCoreApplication::translate("YamlGeneralSettings", "Settings file board (%1) does not match current profile board (%2).\n\nDo you wish to continue?").arg(Boards::getBoardName(msfw->getBoard())).arg(Boards::getBoardName(fw->getBoard()));
if (QMessageBox::question(NULL, CPN_STR_APP_NAME, prmpt, (QMessageBox::Yes | QMessageBox::No), QMessageBox::No) != QMessageBox::Yes) {
// TODO: this triggers an error in the calling code so we need a graceful way to handle