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

Fixes #2517

Browse Source
This commit is contained in:
bsongis
2015-07-22 18:55:54 +02:00
parent 0a213389f4
commit a94d08606f
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/eeprominterface.h
+7 -7
View File
@@ -26,13 +26,13 @@
#include "constants.h"
#include "simulatorinterface.h"
#define EESIZE_STOCK 2048
#define EESIZE_M128 4096
#define EESIZE_GRUVIN9X 4096
#define EESIZE_TARANIS (32*1024)
#define EESIZE_SKY9X (128*4096)
#define EESIZE_9XRPRO (128*4096)
#define EESIZE_RLC_MAX EESIZE_TARANIS
#define EESIZE_STOCK 2048
#define EESIZE_M128 4096
#define EESIZE_GRUVIN9X 4096
#define EESIZE_TARANIS (32*1024)
#define EESIZE_SKY9X (128*4096)
#define EESIZE_9XRPRO (128*4096)
#define EESIZE_MAX EESIZE_9XRPRO
QString getBoardName(BoardEnum board);
companion/src/firmwares/opentx/opentxinterface.cpp
+4 -5
View File
@@ -446,9 +446,8 @@ int OpenTxEepromInterface::getSize(ModelData &model)
if (model.isempty())
return 0;
// TODO something better...
uint8_t tmp[EESIZE_RLC_MAX];
efile->EeFsCreate(tmp, EESIZE_RLC_MAX, board, 255/*version max*/);
QByteArray tmp(EESIZE_MAX, 0);
efile->EeFsCreate((uint8_t *)tmp.data(), EESIZE_MAX, board, 255/*version max*/);
OpenTxModelData open9xModel(model, board, 255/*version max*/, GetCurrentFirmware()->getVariantNumber());
@@ -466,8 +465,8 @@ int OpenTxEepromInterface::getSize(GeneralSettings &settings)
if (IS_SKY9X(board))
return 0;
uint8_t tmp[EESIZE_RLC_MAX];
efile->EeFsCreate(tmp, EESIZE_RLC_MAX, board, 255);
QByteArray tmp(EESIZE_MAX, 0);
efile->EeFsCreate((uint8_t *)tmp.data(), EESIZE_MAX, board, 255);
OpenTxGeneralData open9xGeneral(settings, board, 255, GetCurrentFirmware()->getVariantNumber());
// open9xGeneral.Dump();
companion/src/flasheepromdialog.cpp
+2 -2
View File
@@ -102,7 +102,7 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
return -1;
}
QByteArray eeprom(EESIZE_RLC_MAX, 0);
QByteArray eeprom(EESIZE_MAX, 0);
int fileType = getFileType(filename);
#if 0
@@ -144,7 +144,7 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
return -1;
}
}
eeprom_size = HexInterface(inputStream).load((uint8_t *)eeprom.data(), EESIZE_RLC_MAX);
eeprom_size = HexInterface(inputStream).load((uint8_t *)eeprom.data(), EESIZE_MAX);
}
else if (fileType==FILE_TYPE_BIN) { //read binary
eeprom_size = file.size();
companion/src/mdichild.cpp
+3 -3
View File
@@ -282,8 +282,8 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
}
}
uint8_t eeprom[EESIZE_RLC_MAX];
int eeprom_size = HexInterface(inputStream).load(eeprom, EESIZE_RLC_MAX);
QByteArray eeprom(EESIZE_MAX, 0);
int eeprom_size = HexInterface(inputStream).load((uint8_t *)eeprom.data(), EESIZE_MAX);
if (!eeprom_size) {
QMessageBox::critical(this, tr("Error"),
tr("Invalid EEPROM File %1")
@@ -294,7 +294,7 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
file.close();
if (!loadEEprom(radioData, eeprom, eeprom_size)) {
if (!loadEEprom(radioData, (uint8_t *)eeprom.data(), eeprom_size)) {
QMessageBox::critical(this, tr("Error"),
tr("Invalid EEPROM File %1")
.arg(fileName));