Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Merge branch 'origin/next'

Browse source
This commit is contained in:
Dvogonen 2014-01-15 22:06:10 +01:00
commit 18a5883f66
142 changed files with 12902 additions and 40805 deletions
Download patch file Download diff file Expand all files Collapse all files

35
companion/src/mainwindow.cpp
View file

@ -59,7 +59,7 @@
#include "burndialog.h"
#include "hexinterface.h"
#include "warnings.h"
#include "firmwares/opentx/open9xinterface.h" // TODO get rid of this include
#include "firmwares/opentx/opentxinterface.h" // TODO get rid of this include
#define DONATE_STR "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QUZ48K4SEXDP2"
#ifdef __APPLE__
@ -1226,34 +1226,29 @@ bool MainWindow::isValidEEPROM(QString eepromfile)
return false;
}
file.close();
RadioData radioData;
if (!LoadEeprom(radioData, eeprom, eeprom_size)) {
free(eeprom);
return false;
} else {
free(eeprom);
return true;
}
} else if (fileType==FILE_TYPE_BIN) { //read binary
RadioData * radioData = new RadioData();
bool result = LoadEeprom(*radioData, eeprom, eeprom_size);
free(eeprom);
delete radioData;
return result;
}
else if (fileType==FILE_TYPE_BIN) { //read binary
if (!file.open(QFile::ReadOnly))
return false;
eeprom_size = file.size();
uint8_t *eeprom = (uint8_t *)malloc(eeprom_size);
memset(eeprom, 0, eeprom_size);
long result = file.read((char*)eeprom, eeprom_size);
long read = file.read((char*)eeprom, eeprom_size);
file.close();
if (result != eeprom_size) {
if (read != eeprom_size) {
free(eeprom);
return false;
}
RadioData radioData;
if (!LoadEeprom(radioData, eeprom, eeprom_size)) {
free(eeprom);
return false;
} else {
free(eeprom);
return true;
}
RadioData * radioData = new RadioData();
bool result = LoadEeprom(*radioData, eeprom, eeprom_size);
free(eeprom);
delete radioData;
return result;
}
return false;
}