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
a2fca7b2
Unverified
Commit
a2fca7b2
authored
Jun 13, 2019
by
Don Gagne
Committed by
GitHub
Jun 13, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7515 from DonLakeFlyer/Fixes
Crash and typo fixes
parents
083dcf0a
c7d0eb75
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
MissionCommandTree.cc
src/MissionManager/MissionCommandTree.cc
+5
-1
ParameterEditorDialog.qml
src/QmlControls/ParameterEditorDialog.qml
+1
-1
No files found.
src/MissionManager/MissionCommandTree.cc
View file @
a2fca7b2
...
...
@@ -223,11 +223,15 @@ QVariantList MissionCommandTree::getCommandsForCategory(Vehicle* vehicle, const
{
MAV_AUTOPILOT
baseFirmwareType
;
MAV_TYPE
baseVehicleType
;
QList
<
MAV_CMD
>
supportedCommands
=
vehicle
->
firmwarePlugin
()
->
supportedMissionCommands
();
_baseVehicleInfo
(
vehicle
,
baseFirmwareType
,
baseVehicleType
);
_buildAllCommands
(
vehicle
);
// vehicle can be null in which case _baseVehicleInfo will tell of the firmware/vehicle type for the offline editing vehicle.
// We then use that to get a firmware plugin so we can get the list of supported commands.
FirmwarePlugin
*
firmwarePlugin
=
qgcApp
()
->
toolbox
()
->
firmwarePluginManager
()
->
firmwarePluginForAutopilot
(
baseFirmwareType
,
baseVehicleType
);
QList
<
MAV_CMD
>
supportedCommands
=
firmwarePlugin
->
supportedMissionCommands
();
QVariantList
list
;
QMap
<
MAV_CMD
,
MissionCommandUIInfo
*>
commandMap
=
_allCommands
[
baseFirmwareType
][
baseVehicleType
];
for
(
MAV_CMD
command
:
commandMap
.
keys
())
{
...
...
src/QmlControls/ParameterEditorDialog.qml
View file @
a2fca7b2
...
...
@@ -232,7 +232,7 @@ QGCViewDialog {
QGCLabel
{
visible
:
fact
.
qgcRebootRequired
text
:
"
Appliction restart required after change
"
text
:
"
Applic
a
tion restart required after change
"
}
QGCLabel
{
...
...
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