Commit dbd23672 authored by Gus Grubba's avatar Gus Grubba

Single firmware wording

parent 093ea12e
......@@ -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")) {
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment