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

Arguably cleaner flash size retrieval

Browse Source
This commit is contained in:
Andre Bernet
2016-08-31 14:28:14 +02:00
parent 03c969fa3c
commit c994260c85
5 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwareinterface.cpp
+4 -4
View File
@@ -44,7 +44,7 @@ int getFileType(const QString &fullFileName)
}
FirmwareInterface::FirmwareInterface(const QString &filename):
flash(MAX_FSIZE, 0),
flash(FSIZE_MAX, 0),
flashSize(0),
versionId(0),
eepromVersion(0),
@@ -59,11 +59,11 @@ FirmwareInterface::FirmwareInterface(const QString &filename):
QFile file(filename);
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { // reading HEX TEXT file
QTextStream inputStream(&file);
flashSize = HexInterface(inputStream).load((uint8_t *)flash.data(), MAX_FSIZE);
flashSize = HexInterface(inputStream).load((uint8_t *)flash.data(), FSIZE_MAX);
file.close();
if (flashSize == 0) {
file.open(QIODevice::ReadOnly);
flashSize = file.read((char *)flash.data(), MAX_FSIZE);
flashSize = file.read((char *)flash.data(), FSIZE_MAX);
}
}
}
@@ -342,7 +342,7 @@ bool FirmwareInterface::isValid()
unsigned int FirmwareInterface::save(QString fileName)
{
uint8_t binflash[MAX_FSIZE];
uint8_t binflash[FSIZE_MAX];
memcpy(&binflash, flash.constData(), flashSize);
QFile file(fileName);