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
cfbd7ae2
Commit
cfbd7ae2
authored
8 years ago
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show firmware version in vehicle summary
parent
c5716365
master
dev1
merge_branch_alt
original
phil
rc1
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
APMAirframeComponentSummary.qml
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
+5
-0
AirframeComponentSummary.qml
src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml
+5
-0
FirmwareUpgradeController.cc
src/VehicleSetup/FirmwareUpgradeController.cc
+0
-1
No files found.
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
View file @
cfbd7ae2
...
...
@@ -32,5 +32,10 @@ FactPanel {
:
/* Fact.value == 10 */
"
New Y6
"
);
}
VehicleSummaryRow
{
labelText
:
qsTr
(
"
Firmware Version:
"
)
valueText
:
activeVehicle
.
firmwareMajorVersion
==
-
1
?
qsTr
(
"
Unknown
"
)
:
activeVehicle
.
firmwareMajorVersion
+
"
.
"
+
activeVehicle
.
firmwareMinorVersion
+
"
.
"
+
activeVehicle
.
firmwarePatchVersion
+
activeVehicle
.
firmwareVersionTypeString
}
}
}
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml
View file @
cfbd7ae2
...
...
@@ -34,5 +34,10 @@ FactPanel {
labelText
:
qsTr
(
"
Vehicle:
"
)
valueText
:
autoStartSet
?
controller
.
currentVehicleName
:
qsTr
(
"
Setup required
"
)
}
VehicleSummaryRow
{
labelText
:
qsTr
(
"
Firmware Version:
"
)
valueText
:
activeVehicle
.
firmwareMajorVersion
==
-
1
?
qsTr
(
"
Unknown
"
)
:
activeVehicle
.
firmwareMajorVersion
+
"
.
"
+
activeVehicle
.
firmwareMinorVersion
+
"
.
"
+
activeVehicle
.
firmwarePatchVersion
+
activeVehicle
.
firmwareVersionTypeString
}
}
}
This diff is collapsed.
Click to expand it.
src/VehicleSetup/FirmwareUpgradeController.cc
View file @
cfbd7ae2
...
...
@@ -727,7 +727,6 @@ void FirmwareUpgradeController::_loadAPMVersions(QGCSerialPortInfo::BoardType_t
}
}
void
FirmwareUpgradeController
::
_apmVersionDownloadFinished
(
QString
remoteFile
,
QString
localFile
)
{
qCDebug
(
FirmwareUpgradeLog
)
<<
"Download complete"
<<
remoteFile
<<
localFile
;
...
...
This diff is collapsed.
Click to expand it.
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