Show commit hash on dev branch instead of version

flipperdevices · Sep 22, 2021 · 8c388bc · 8c388bc
1 parent dc46b8e
commit 8c388bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/backend/flipperzero/deviceinfofetcher.cpp b/backend/flipperzero/deviceinfofetcher.cpp
@@ -162,6 +162,12 @@ void VCPDeviceInfoFetcher::parseLine(const QByteArray &line)
         m_deviceInfo.target = QStringLiteral("f") + value;
     } else if(line.startsWith(QByteArrayLiteral("firmware_version"))) {
         m_deviceInfo.firmware.version = value;
+    } else if(line.startsWith(QByteArrayLiteral("firmware_commit"))) {
+        m_deviceInfo.firmware.commit = value;
+    } else if(line.startsWith(QByteArrayLiteral("firmware_branch"))) {
+        m_deviceInfo.firmware.branch = value;
+    } else if(line.startsWith(QByteArrayLiteral("firmware_build_date"))) {
+        m_deviceInfo.firmware.date = QDateTime::fromString(value, QStringLiteral("dd-MM-yyyy"));
     } else {}
 }
 

diff --git a/backend/flipperzero/flipperzero.cpp b/backend/flipperzero/flipperzero.cpp
@@ -136,7 +136,11 @@ const QString &FlipperZero::target() const
 
 const QString &FlipperZero::version() const
 {
-    return m_deviceInfo.firmware.version;
+    if(m_deviceInfo.firmware.branch == QStringLiteral("dev")) {
+        return m_deviceInfo.firmware.commit;
+    } else {
+        return m_deviceInfo.firmware.version;
+    }
 }
 
 const QString &FlipperZero::messageString() const