From 0512ca79efee5245989618fe70bfbca6717ec4e4 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Tue, 28 May 2013 04:14:54 +0300 Subject: [PATCH] OP-770: export GCS branch dirty state and short UAVO hash --- .../uavsettingsimportexportfactory.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexportfactory.cpp b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexportfactory.cpp index 42fcb3b8f..d5b1c7e9a 100644 --- a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexportfactory.cpp +++ b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexportfactory.cpp @@ -241,15 +241,18 @@ QString UAVSettingsImportExportFactory::createXMLDocument(const enum storedData versionInfo.appendChild(hw); QDomElement fw = doc.createElement("firmware"); + QString uavo = board.uavoHash.toHex(); + fw.setAttribute("tag", board.gitTag); fw.setAttribute("date", board.gitDate); fw.setAttribute("hash", board.gitHash); - fw.setAttribute("tag", board.gitTag); + fw.setAttribute("uavo", uavo.left(8)); versionInfo.appendChild(fw); QDomElement gcs = doc.createElement("gcs"); + gcs.setAttribute("tag", VersionInfo::tagOrBranch() + VersionInfo::dirty()); gcs.setAttribute("date", VersionInfo::dateTime()); - gcs.setAttribute("hash", VersionInfo::hash()); - gcs.setAttribute("tag", VersionInfo::tagOrBranch()); + gcs.setAttribute("hash", VersionInfo::hash().left(8)); + gcs.setAttribute("uavo", VersionInfo::uavoHash().left(8)); versionInfo.appendChild(gcs); // create settings and/or data elements