From dbd23672ea512ff194afdba0d3c715a7d0e94a81 Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Thu, 21 Dec 2017 12:41:14 -0500
Subject: [PATCH] Single firmware wording

---
 src/VehicleSetup/FirmwareImage.cc    | 2 +-
 src/VehicleSetup/FirmwareUpgrade.qml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/VehicleSetup/FirmwareImage.cc b/src/VehicleSetup/FirmwareImage.cc
index eb37b5b5ee..435a9caf4a 100644
--- a/src/VehicleSetup/FirmwareImage.cc
+++ b/src/VehicleSetup/FirmwareImage.cc
@@ -54,7 +54,7 @@ bool FirmwareImage::load(const QString& imageFilename, uint32_t boardId)
     if (imageFilename.endsWith(".bin")) {
         _binFormat = true;
         return _binLoad(imageFilename);
-    } else if (imageFilename.endsWith(".px4")) {
+    } else if (imageFilename.endsWith(".px4") || imageFilename.endsWith(".zip")) {
         _binFormat = true;
         return _px4Load(imageFilename);
     } else if (imageFilename.endsWith(".ihx")) {
diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml
index 9ae02382fa..4e0f525cf7 100644
--- a/src/VehicleSetup/FirmwareUpgrade.qml
+++ b/src/VehicleSetup/FirmwareUpgrade.qml
@@ -45,6 +45,7 @@ SetupPage {
             readonly property string highlightPrefix:   "<font color=\"" + qgcPal.warningText + "\">"
             readonly property string highlightSuffix:   "</font>"
             readonly property string welcomeText:       qsTr("%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.").arg(QGroundControl.appName)
+            readonly property string welcomeTextSingle: qsTr("Update the autopilot firmware to the latest version")
             readonly property string plugInText:        "<big>" + highlightPrefix + "Plug in your device" + highlightSuffix + " via USB to " + highlightPrefix + "start" + highlightSuffix + " firmware upgrade.</big>"
             readonly property string flashFailText:     "If upgrade failed, make sure to connect " + highlightPrefix + "directly" + highlightSuffix + " to a powered USB port on your computer, not through a USB hub. " +
                                                         "Also make sure you are only powered via USB " + highlightPrefix + "not battery" + highlightSuffix + "."
@@ -410,7 +411,7 @@ SetupPage {
                 frameVisible:       false
                 font.pointSize:     ScreenTools.defaultFontPointSize
                 textFormat:         TextEdit.RichText
-                text:               welcomeText
+                text:               _singleFirmwareMode ? welcomeTextSingle : welcomeText
 
                 style: TextAreaStyle {
                     textColor:          qgcPal.text
-- 
GitLab