Adds support for only reading I8HEX (Intel HEX with 16 bit addresses) format.

Author: sardylan

CMakeLists.txt

@@ -56,8 +56,8 @@ endif ()
 
 set(QFM1000_APPLICATION_NAME "qFM1000")
 set(QFM1000_APPLICATION_VERSION_MAJOR "0")
-set(QFM1000_APPLICATION_VERSION_MINOR "4")
-set(QFM1000_APPLICATION_VERSION_PATCH "2")
+set(QFM1000_APPLICATION_VERSION_MINOR "5")
+set(QFM1000_APPLICATION_VERSION_PATCH "0")
 
 set(QFM1000_ORGANIZATION_NAME "The HellNet.org")
 set(QFM1000_ORGANIZATION_DOMAIN "thehellnet.org")

README.md

@@ -30,6 +30,8 @@ Windows build are created using the official releases of Qt 5.9.2. Just download
 ## Changelog
 
 
+* 0.5.0
+    * ADD: Support for reading files in I8HEX (Intel HEX with 16 bit addresses) format
 * 0.4.2
     * FIX: Arduino serial port in Windows
 * 0.4.1

src/eeprom/filemanager.cpp

@@ -25,15 +25,19 @@
 
 bool FileManager::loadFromFile(EEPROM *eeprom, QString filename) {
     QFile file(filename);
-    if (!file.exists() || file.size() != 2048)
+    if (!file.exists())
         return false;
 
     if (!file.open(QIODevice::ReadOnly))
         return false;
 
-    QByteArray data = file.readAll();
+    QByteArray rawData = file.readAll();
+    QByteArray data = parseFile(rawData);
     file.close();
 
+    if (data.length() != 2048)
+        return false;
+
     eeprom->setData(data);
 
     return true;
@@ -50,3 +54,73 @@ bool FileManager::saveToFile(EEPROM *eeprom, QString filename) {
 
     return true;
 }
+
+QByteArray FileManager::parseFile(const QByteArray &rawData) {
+    QByteArray data;
+
+    if (rawData.size() == 2048) {
+        data = rawData;
+    } else if (isIntelHex(rawData)) {
+        data = intelHexToByteArray(rawData);
+    }
+
+    return data;
+}
+
+bool FileManager::isIntelHex(const QByteArray &rawFile) {
+    QStringList rows = splitInLines(rawFile);
+
+    for (const QString &row : rows)
+        if (!row.startsWith(":"))
+            return false;
+
+    return rows.last() == ":00000001FF";
+
+}
+
+QStringList FileManager::splitInLines(const QByteArray &rawData) {
+    QString rawFileString = QString::fromLatin1(rawData);
+    QStringList rows = rawFileString.replace('\r', '\n').split('\n', QString::SkipEmptyParts);
+    return rows;
+}
+
+QByteArray FileManager::intelHexToByteArray(const QByteArray &rawData) {
+    QStringList rows = splitInLines(rawData);
+
+    QByteArray data;
+    int previousOffest = 0;
+
+    for (const QString &row : rows) {
+        unsigned int checksum = 0;
+        for (auto &c : QByteArray::fromHex(row.toLatin1()))
+            checksum += (unsigned char) c;
+
+        checksum &= 0b11111111;
+
+        if (checksum != 0)
+            return QByteArray();
+
+        int size = row.mid(1, 2).toInt(nullptr, 16);
+        int offset = row.mid(3, 4).toInt(nullptr, 16);
+        int type = row.mid(7, 2).toInt(nullptr, 16);
+        QByteArray lineData = QByteArray::fromHex(row.mid(9, size * 2).toLatin1());
+
+        if (type == 0x01)
+            break;
+        if (type != 0x00)
+            continue;
+
+        if (offset != previousOffest)
+            return QByteArray();
+
+        previousOffest = offset + size;
+
+
+        if (lineData.size() != size)
+            return QByteArray();
+
+        data.append(lineData);
+    }
+
+    return data;
+}

src/eeprom/filemanager.hpp

@@ -32,6 +32,15 @@ class FileManager {
     static bool loadFromFile(EEPROM *eeprom, QString filename);
 
     static bool saveToFile(EEPROM *eeprom, QString filename);
+
+private:
+    static QByteArray parseFile(const QByteArray &rawData);
+
+    static bool isIntelHex(const QByteArray &rawFile);
+
+    static QStringList splitInLines(const QByteArray &rawData);
+
+    static QByteArray intelHexToByteArray(const QByteArray &rawData);
 };
 
 #endif