From 721cb16c2b96f61cb2f52a4b0898873599c7d1d4 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Mon, 22 Oct 2012 23:44:01 +0300 Subject: [PATCH] Adopt to the latest release policy See http://wiki.openpilot.org/display/Doc/Release+policy --- ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp | 6 +++--- .../src/plugins/uploader/runningdevicewidget.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp index c944f9a37..9293ede5f 100644 --- a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp @@ -158,7 +158,7 @@ bool deviceWidget::populateBoardStructuredDescription(QByteArray desc) { myDevice->lblGitTag->setText(onBoardDescription.gitHash); myDevice->lblBuildDate->setText(onBoardDescription.gitDate.insert(4,"-").insert(7,"-")); - if(onBoardDescription.gitTag.startsWith("release",Qt::CaseInsensitive)) + if(onBoardDescription.gitTag.startsWith("RELEASE",Qt::CaseSensitive)) { myDevice->lblDescription->setText(QString("Firmware tag: ")+onBoardDescription.gitTag); QPixmap pix = QPixmap(QString(":uploader/images/application-certificate.svg")); @@ -188,7 +188,7 @@ bool deviceWidget::populateLoadedStructuredDescription(QByteArray desc) { myDevice->lblGitTagL->setText(LoadedDescription.gitHash); myDevice->lblBuildDateL->setText( LoadedDescription.gitDate.insert(4,"-").insert(7,"-")); - if(LoadedDescription.gitTag.startsWith("release",Qt::CaseInsensitive)) + if(LoadedDescription.gitTag.startsWith("RELEASE",Qt::CaseSensitive)) { myDevice->lblDescritpionL->setText(LoadedDescription.gitTag); myDevice->description->setText(LoadedDescription.gitTag); @@ -302,7 +302,7 @@ void deviceWidget::loadFirmware() myDevice->statusLabel->setText(tr("The board has newer firmware than loaded. Are you sure you want to update?")); px.load(QString(":/uploader/images/warning.svg")); } - else if(!LoadedDescription.gitTag.startsWith("release",Qt::CaseInsensitive)) + else if(!LoadedDescription.gitTag.startsWith("RELEASE",Qt::CaseSensitive)) { 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)")); px.load(QString(":/uploader/images/warning.svg")); diff --git a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp index 284345b62..143d1e81c 100644 --- a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp @@ -103,7 +103,7 @@ void runningDeviceWidget::populate() deviceDescriptorStruct devDesc; if(UAVObjectUtilManager::descriptionToStructure(description,devDesc)) { - if(devDesc.gitTag.startsWith("release",Qt::CaseInsensitive)) + if(devDesc.gitTag.startsWith("RELEASE",Qt::CaseSensitive)) { myDevice->lblFWTag->setText(QString("Firmware tag: ")+devDesc.gitTag); QPixmap pix = QPixmap(QString(":uploader/images/application-certificate.svg"));