Skip to content

Commit 877177a

Browse files
f5sohf5soh
committed
LP-593 Basic check for firmware, tagged and matched firmware with GCS
1 parent 1ab7956 commit 877177a

2 files changed

Lines changed: 45 additions & 8 deletions

File tree

‎ground/gcs/src/plugins/uploader/devicewidget.cpp‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2727
*/
2828
#include "devicewidget.h"
29+
#include "version_info/version_info.h"
2930

3031
#include <QFileDialog>
3132
#include <QDebug>
@@ -216,10 +217,14 @@ bool DeviceWidget::populateBoardStructuredDescription(QByteArray desc)
216217
if (UAVObjectUtilManager::descriptionToStructure(desc, onBoardDescription)) {
217218
myDevice->lblGitTag->setText(onBoardDescription.gitHash);
218219
myDevice->lblBuildDate->setText(onBoardDescription.gitDate.insert(4, "-").insert(7, "-"));
219-
if (onBoardDescription.gitTag.startsWith("RELEASE", Qt::CaseSensitive)) {
220+
if ((onBoardDescription.gitTag == VersionInfo::tag()) && (onBoardDescription.gitHash == VersionInfo::hash8())) {
220221
myDevice->lblDescription->setText(onBoardDescription.gitTag);
221222
myDevice->lblCertified->setPixmap(QPixmap(":uploader/images/application-certificate.svg"));
222223
myDevice->lblCertified->setToolTip(tr("Tagged officially released firmware build"));
224+
} else if ((onBoardDescription.gitTag == VersionInfo::fwTag()) && (onBoardDescription.gitHash == VersionInfo::hash8())) {
225+
myDevice->lblDescription->setText(onBoardDescription.gitTag);
226+
myDevice->lblCertified->setPixmap(QPixmap(":uploader/images/dialog-apply.svg"));
227+
myDevice->lblCertified->setToolTip(tr("Matched firmware build"));
223228
} else {
224229
myDevice->lblDescription->setText(onBoardDescription.gitTag);
225230
myDevice->lblCertified->setPixmap(QPixmap(":uploader/images/warning.svg"));
@@ -239,11 +244,16 @@ bool DeviceWidget::populateLoadedStructuredDescription(QByteArray desc)
239244
if (UAVObjectUtilManager::descriptionToStructure(desc, LoadedDescription)) {
240245
myDevice->lblGitTagL->setText(LoadedDescription.gitHash);
241246
myDevice->lblBuildDateL->setText(LoadedDescription.gitDate.insert(4, "-").insert(7, "-"));
242-
if (LoadedDescription.gitTag.startsWith("RELEASE", Qt::CaseSensitive)) {
247+
if ((LoadedDescription.gitTag == VersionInfo::tag()) && (LoadedDescription.gitHash == VersionInfo::hash8())) {
243248
myDevice->lblDescritpionL->setText(LoadedDescription.gitTag);
244249
myDevice->description->setText(LoadedDescription.gitTag);
245250
myDevice->lblCertifiedL->setPixmap(QPixmap(":uploader/images/application-certificate.svg"));
246251
myDevice->lblCertifiedL->setToolTip(tr("Tagged officially released firmware build"));
252+
} else if ((LoadedDescription.gitTag == VersionInfo::fwTag()) && (LoadedDescription.gitHash == VersionInfo::hash8())) {
253+
myDevice->lblDescritpionL->setText(LoadedDescription.gitTag);
254+
myDevice->description->setText(LoadedDescription.gitTag);
255+
myDevice->lblCertifiedL->setPixmap(QPixmap(":uploader/images/dialog-apply.svg"));
256+
myDevice->lblCertifiedL->setToolTip(tr("Matched firmware build"));
247257
} else {
248258
myDevice->lblDescritpionL->setText(LoadedDescription.gitTag);
249259
myDevice->description->setText(LoadedDescription.gitTag);
@@ -347,7 +357,7 @@ void DeviceWidget::loadFirmware(QString fwfilename)
347357
} else if (QDateTime::fromString(onBoardDescription.gitDate) > QDateTime::fromString(LoadedDescription.gitDate)) {
348358
myDevice->statusLabel->setText(tr("The board has newer firmware than loaded. Are you sure you want to update?"));
349359
px.load(QString(":/uploader/images/warning.svg"));
350-
} else if (!LoadedDescription.gitTag.startsWith("RELEASE", Qt::CaseSensitive)) {
360+
} else if (!(LoadedDescription.gitTag == VersionInfo::tag()) && (onBoardDescription.gitHash == VersionInfo::hash8())) {
351361
myDevice->statusLabel->setText(tr("The loaded firmware is untagged or custom build. Update only if it was received from a trusted source (official website or your own build)."));
352362
px.load(QString(":/uploader/images/warning.svg"));
353363
} else {

‎ground/gcs/src/plugins/uploader/runningdevicewidget.cpp‎

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "runningdevicewidget.h"
2929
#include "devicedescriptorstruct.h"
3030
#include "uploadergadgetwidget.h"
31+
#include "version_info/version_info.h"
3132

3233
RunningDeviceWidget::RunningDeviceWidget(QWidget *parent) :
3334
QWidget(parent)
@@ -135,15 +136,41 @@ void RunningDeviceWidget::populate()
135136

136137
deviceDescriptorStruct devDesc;
137138
if (UAVObjectUtilManager::descriptionToStructure(description, devDesc)) {
138-
if (devDesc.gitTag.startsWith("RELEASE", Qt::CaseSensitive)) {
139-
myDevice->lblFWTag->setText(tr("Firmware tag: ") + devDesc.gitTag);
139+
// Convert current QString uavoHashArray stored in GCS to QByteArray
140+
QString uavoHash = VersionInfo::uavoHashArray();
141+
142+
uavoHash.chop(2);
143+
uavoHash.remove(0, 2);
144+
uavoHash = uavoHash.trimmed();
145+
146+
QByteArray uavoHashArray;
147+
bool ok;
148+
foreach(QString str, uavoHash.split(",")) {
149+
uavoHashArray.append(str.toInt(&ok, 16));
150+
}
151+
152+
bool isCompatibleUavo = (uavoHashArray == devDesc.uavoHash);
153+
bool isTaggedGcs = (VersionInfo::tag() != "");
154+
bool isSameCommit = (devDesc.gitHash == VersionInfo::hash8());
155+
bool isSameTag = (devDesc.gitTag == VersionInfo::fwTag());
156+
157+
if (isTaggedGcs && isSameCommit && isSameTag && isCompatibleUavo) {
158+
// GCS tagged and firmware from same commit
140159
myDevice->lblCertified->setPixmap(QPixmap(":uploader/images/application-certificate.svg"));
141-
myDevice->lblCertified->setToolTip(tr("Tagged officially released firmware build"));
142-
} else {
143-
myDevice->lblFWTag->setText(tr("Firmware tag: ") + devDesc.gitTag);
160+
myDevice->lblCertified->setToolTip(tr("Matched firmware build with official tagged release"));
161+
} else if (!isTaggedGcs && isSameCommit && isSameTag && isCompatibleUavo) {
162+
// GCS untagged and firmware from same commit
163+
myDevice->lblCertified->setPixmap(QPixmap(":uploader/images/dialog-apply.svg"));
164+
myDevice->lblCertified->setToolTip(tr("Matched firmware build"));
165+
} else if ((!isSameCommit || !isSameTag) && isCompatibleUavo) {
166+
// firmware not matching current GCS but compatible UAVO
144167
myDevice->lblCertified->setPixmap(QPixmap(":uploader/images/warning.svg"));
145168
myDevice->lblCertified->setToolTip(tr("Untagged or custom firmware build"));
169+
} else {
170+
myDevice->lblCertified->setPixmap(QPixmap(":uploader/images/error.svg"));
171+
myDevice->lblCertified->setToolTip(tr("Uncompatible firmware build"));
146172
}
173+
myDevice->lblFWTag->setText(tr("Firmware tag: ") + devDesc.gitTag);
147174
myDevice->lblGitCommitTag->setText(tr("Git commit hash: ") + devDesc.gitHash);
148175
myDevice->lblFWDate->setText(tr("Firmware date: ") + devDesc.gitDate.insert(4, "-").insert(7, "-"));
149176
} else {

0 commit comments

Comments
 (0)