[Companion] OTX format bug with X9D boards
The files were always converted as X9D doesn't have its own FourCC
This commit is contained in:
@@ -111,6 +111,7 @@ Board::SwitchInfo getSwitchInfo(Board::Type board, unsigned index);
|
||||
#define IS_9XRPRO(board) (board==Board::BOARD_9XRPRO)
|
||||
#define IS_TARANIS_X7(board) (board==Board::BOARD_TARANIS_X7)
|
||||
#define IS_TARANIS_X9(board) (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E)
|
||||
#define IS_TARANIS_X9D(board) (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP)
|
||||
#define IS_TARANIS_PLUS(board) (board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E)
|
||||
#define IS_TARANIS_X9E(board) (board==Board::BOARD_TARANIS_X9E)
|
||||
#define IS_TARANIS(board) (IS_TARANIS_X9(board) || IS_TARANIS_X7(board))
|
||||
|
||||
@@ -496,7 +496,7 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)
|
||||
void MainWindow::startFirmwareDownload()
|
||||
{
|
||||
QString url = current_firmware_variant->getFirmwareUrl();
|
||||
qDebug() "Downloading firmware" << url;
|
||||
qDebug() << "Downloading firmware" << url;
|
||||
QString ext = url.mid(url.lastIndexOf("."));
|
||||
QString defaultFilename = g.flashDir() + "/" + current_firmware_variant->getId();
|
||||
if (g.profile[g.id()].renameFwFiles()) {
|
||||
|
||||
@@ -507,7 +507,7 @@ bool MdiChild::loadFile(const QString & filename, bool resetCurrentFile)
|
||||
setCurrentFile(filename);
|
||||
}
|
||||
|
||||
if (storage.getBoard() != getCurrentBoard()) {
|
||||
if (!storage.isBoardCompatible(getCurrentBoard())) {
|
||||
convertStorage(storage.getBoard(), getCurrentBoard());
|
||||
}
|
||||
|
||||
|
||||
@@ -62,10 +62,22 @@ class StorageFormat
|
||||
|
||||
virtual QString name() = 0;
|
||||
|
||||
virtual Board::Type getBoard() {
|
||||
virtual Board::Type getBoard()
|
||||
{
|
||||
return board;
|
||||
}
|
||||
|
||||
virtual bool isBoardCompatible(Board::Type board)
|
||||
{
|
||||
if (this->board == board)
|
||||
return true;
|
||||
|
||||
if (IS_TARANIS_X9D(this->board) && IS_TARANIS_X9D(board))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
protected:
|
||||
void setError(const QString & error)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user