Commit 2dd6afd4 authored by Gus Grubba's avatar Gus Grubba

Fix wording for custom firmware.

Remove zip experiment.
parent 4a3e6e97
...@@ -54,7 +54,7 @@ bool FirmwareImage::load(const QString& imageFilename, uint32_t boardId) ...@@ -54,7 +54,7 @@ bool FirmwareImage::load(const QString& imageFilename, uint32_t boardId)
if (imageFilename.endsWith(".bin")) { if (imageFilename.endsWith(".bin")) {
_binFormat = true; _binFormat = true;
return _binLoad(imageFilename); return _binLoad(imageFilename);
} else if (imageFilename.endsWith(".px4") || imageFilename.endsWith(".zip")) { } else if (imageFilename.endsWith(".px4")) {
_binFormat = true; _binFormat = true;
return _px4Load(imageFilename); return _px4Load(imageFilename);
} else if (imageFilename.endsWith(".ihx")) { } else if (imageFilename.endsWith(".ihx")) {
......
...@@ -311,7 +311,7 @@ SetupPage { ...@@ -311,7 +311,7 @@ SetupPage {
visible: !px4Flow visible: !px4Flow
Rectangle { Rectangle {
height: 1 height: 1
width: ScreenTools.defaultFontPixelWidth * 5 width: ScreenTools.defaultFontPixelWidth * 5
color: qgcPal.text color: qgcPal.text
anchors.verticalCenter: _advanced.verticalCenter anchors.verticalCenter: _advanced.verticalCenter
...@@ -341,7 +341,7 @@ SetupPage { ...@@ -341,7 +341,7 @@ SetupPage {
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
visible: showFirmwareTypeSelection visible: showFirmwareTypeSelection
text: px4Flow ? qsTr("Select which version of the firmware you would like to install:") : qsTr("Select which version of the above flight stack you would like to install:") text: _singleFirmwareMode ? qsTr("Select the standard version or one from the file system (previously downloaded):") : (px4Flow ? qsTr("Select which version of the firmware you would like to install:") : qsTr("Select which version of the above flight stack you would like to install:"))
} }
QGCComboBox { QGCComboBox {
......
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