chore(cpn): refactor firmware flashing to use edgetx rs_dfu (#6521)
Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
co-authored by
raphaelcoeffic
parent
23830197b3
commit
dbce54dec6
+20
-17
@@ -232,23 +232,6 @@ static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
|
||||
return s1.toLower() < s2.toLower();
|
||||
}
|
||||
|
||||
bool displayT16ImportWarning()
|
||||
{
|
||||
QMessageBox msgBox;
|
||||
msgBox.setWindowTitle(QObject::tr("WARNING"));
|
||||
msgBox.setText(QObject::tr("<p>Importing JumperTX data into OpenTX 2.3 is <b>not supported and dangerous.</b></p> \
|
||||
<p>It is unfortunately not possible for us to differentiate JumperTX data from legitimate FrSky X10 data, but <b>You should only continue here if the file you opened comes from a real FrSky X10.</b></p> \
|
||||
<p>Do you really want to continue?</p>"));
|
||||
msgBox.setIcon(QMessageBox::Warning);
|
||||
msgBox.addButton(QMessageBox::No);
|
||||
msgBox.addButton(QMessageBox::Yes);
|
||||
msgBox.setDefaultButton(QMessageBox::No);
|
||||
|
||||
if (msgBox.exec() == QMessageBox::No)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
void Helpers::populateFileComboBox(QComboBox * b, const QSet<QString> & set, const QString & current)
|
||||
{
|
||||
b->clear();
|
||||
@@ -347,6 +330,26 @@ int Helpers::getFirstPosValueIndex(QComboBox * cbo)
|
||||
return -1;
|
||||
}
|
||||
|
||||
QString Helpers::concatPath(QString & str1, QString & str2, bool onlyonesep)
|
||||
{
|
||||
return (str1 % ((!str1.endsWith("/") || !onlyonesep) ? "/" : "") % str2);
|
||||
}
|
||||
|
||||
QString Helpers::concatPath(const QString & str1, const QString & str2, bool onlyonesep)
|
||||
{
|
||||
return (str1 % ((!str1.endsWith("/") || !onlyonesep) ? "/" : "") % str2);
|
||||
}
|
||||
|
||||
QString Helpers::concatPath(const QString & str1, QString & str2, bool onlyonesep)
|
||||
{
|
||||
return (str1 % ((!str1.endsWith("/") || !onlyonesep) ? "/" : "") % str2);
|
||||
}
|
||||
|
||||
QString Helpers::concatPath(QString & str1, const QString & str2, bool onlyonesep)
|
||||
{
|
||||
return (str1 % ((!str1.endsWith("/") || !onlyonesep) ? "/" : "") % str2);
|
||||
}
|
||||
|
||||
#ifdef __APPLE__
|
||||
// Flag when simulator is running
|
||||
static bool simulatorRunning = false;
|
||||
|
||||
Reference in New Issue
Block a user