Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
9eb431f5
Commit
9eb431f5
authored
Mar 23, 2019
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
9a339fca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
8 deletions
+31
-8
FirmwareUpgrade.qml
src/VehicleSetup/FirmwareUpgrade.qml
+31
-8
No files found.
src/VehicleSetup/FirmwareUpgrade.qml
View file @
9eb431f5
...
@@ -23,9 +23,14 @@ import QGroundControl.Controllers 1.0
...
@@ -23,9 +23,14 @@ import QGroundControl.Controllers 1.0
import
QGroundControl
.
ScreenTools
1.0
import
QGroundControl
.
ScreenTools
1.0
SetupPage
{
SetupPage
{
id
:
firmwarePage
id
:
firmwarePage
pageComponent
:
firmwarePageComponent
pageComponent
:
firmwarePageComponent
pageName
:
"
Firmware
"
// For building setup page title: 'Firmware Setup'
pageName
:
qsTr
(
"
Firmware
"
)
showAdvanced
:
_activeVehicle
&&
_activeVehicle
.
apmFirmware
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
signal
cancelDialog
Component
{
Component
{
id
:
firmwarePageComponent
id
:
firmwarePageComponent
...
@@ -40,7 +45,7 @@ SetupPage {
...
@@ -40,7 +45,7 @@ SetupPage {
// a better way to hightlight them, or use less highlights.
// a better way to hightlight them, or use less highlights.
// User visible strings
// User visible strings
readonly
property
string
title
:
"
Firmware Setup
"
// Popup dialog title
readonly
property
string
title
:
qsTr
(
"
Firmware Setup
"
)
// Popup dialog title
readonly
property
string
highlightPrefix
:
"
<font color=
\"
"
+
qgcPal
.
warningText
+
"
\"
>
"
readonly
property
string
highlightPrefix
:
"
<font color=
\"
"
+
qgcPal
.
warningText
+
"
\"
>
"
readonly
property
string
highlightSuffix
:
"
</font>
"
readonly
property
string
highlightSuffix
:
"
</font>
"
...
@@ -124,8 +129,8 @@ SetupPage {
...
@@ -124,8 +129,8 @@ SetupPage {
}
}
onError
:
{
onError
:
{
hideDialog
()
statusTextArea
.
append
(
flashFailText
)
statusTextArea
.
append
(
flashFailText
)
firmwarePage
.
cancelDialog
()
}
}
}
}
...
@@ -165,7 +170,11 @@ SetupPage {
...
@@ -165,7 +170,11 @@ SetupPage {
px4FlightStackRadio2
.
text
=
qsTr
(
"
PX4 Flight Stack
"
)
+
versionString
px4FlightStackRadio2
.
text
=
qsTr
(
"
PX4 Flight Stack
"
)
+
versionString
}
}
Component.onCompleted
:
updatePX4VersionDisplay
()
Component.onCompleted
:
{
firmwarePage
.
advanced
=
false
firmwarePage
.
showAdvanced
=
false
updatePX4VersionDisplay
()
}
function
accept
()
{
function
accept
()
{
hideDialog
()
hideDialog
()
...
@@ -195,6 +204,12 @@ SetupPage {
...
@@ -195,6 +204,12 @@ SetupPage {
cancelFlash
()
cancelFlash
()
}
}
Connections
{
target
:
firmwarePage
onCancelDialog
:
reject
()
}
ExclusiveGroup
{
ExclusiveGroup
{
id
:
firmwareGroup
id
:
firmwareGroup
}
}
...
@@ -438,8 +453,16 @@ SetupPage {
...
@@ -438,8 +453,16 @@ SetupPage {
}
}
ProgressBar
{
ProgressBar
{
id
:
progressBar
id
:
progressBar
Layout.preferredWidth
:
parent
.
width
Layout.preferredWidth
:
parent
.
width
visible
:
!
flashBootloaderButton
.
visible
}
QGCButton
{
id
:
flashBootloaderButton
text
:
qsTr
(
"
Flash ChibiOS Bootloader
"
)
visible
:
firmwarePage
.
advanced
onClicked
:
_activeVehicle
.
flashBootloader
()
}
}
TextArea
{
TextArea
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment