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
8cefc566
Commit
8cefc566
authored
Feb 09, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix mission command overrides for offline edit
parent
82fa217b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
20 deletions
+21
-20
MavCmdInfoCommon.json
src/FirmwarePlugin/APM/MavCmdInfoCommon.json
+15
-0
MavCmdInfoFixedWing.json
src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
+0
-15
MissionCommands.cc
src/MissionManager/MissionCommands.cc
+4
-4
MissionItem.cc
src/MissionManager/MissionItem.cc
+2
-1
No files found.
src/FirmwarePlugin/APM/MavCmdInfoCommon.json
View file @
8cefc566
...
...
@@ -2,5 +2,20 @@
"version"
:
1
,
"mavCmdInfo"
:
[
{
"id"
:
22
,
"rawName"
:
"MAV_CMD_NAV_TAKEOFF"
,
"friendlyName"
:
"Takeoff"
,
"description"
:
"Take off from the ground."
,
"specifiesCoordinate"
:
false
,
"friendlyEdit"
:
true
,
"category"
:
"Basic"
,
"param1"
:
{
"label"
:
"Pitch:"
,
"units"
:
"radians"
,
"default"
:
0.26179939
,
"decimalPlaces"
:
2
}
}
]
}
src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
View file @
8cefc566
...
...
@@ -2,20 +2,5 @@
"version"
:
1
,
"mavCmdInfo"
:
[
{
"id"
:
22
,
"rawName"
:
"MAV_CMD_NAV_TAKEOFF"
,
"friendlyName"
:
"Takeoff"
,
"description"
:
"Take off from the ground."
,
"specifiesCoordinate"
:
false
,
"friendlyEdit"
:
true
,
"category"
:
"Basic"
,
"param1"
:
{
"label"
:
"Pitch:"
,
"units"
:
"radians"
,
"default"
:
0.26179939
,
"decimalPlaces"
:
2
}
}
]
}
src/MissionManager/MissionCommands.cc
View file @
8cefc566
...
...
@@ -153,13 +153,13 @@ MavCmdInfo* MissionCommands::getMavCmdInfo(MAV_CMD command, Vehicle* vehicle) co
if
(
_autopilotToMultiRotorMissionCommands
[
firmwareType
]
->
contains
(
command
))
{
mavCmdInfo
=
_autopilotToMultiRotorMissionCommands
[
firmwareType
]
->
getMavCmdInfo
(
command
);
}
}
else
{
if
(
_autopilotToCommonMissionCommands
[
firmwareType
]
->
contains
(
command
))
{
mavCmdInfo
=
_autopilotToCommonMissionCommands
[
firmwareType
]
->
getMavCmdInfo
(
command
);
}
}
}
if
(
!
mavCmdInfo
&&
_autopilotToCommonMissionCommands
[
firmwareType
]
->
contains
(
command
))
{
mavCmdInfo
=
_autopilotToCommonMissionCommands
[
firmwareType
]
->
getMavCmdInfo
(
command
);
}
if
(
!
mavCmdInfo
)
{
mavCmdInfo
=
_commonMissionCommands
.
getMavCmdInfo
(
command
);
}
...
...
src/MissionManager/MissionItem.cc
View file @
8cefc566
...
...
@@ -813,7 +813,8 @@ void MissionItem::setDefaultsForCommand(void)
MAV_CMD
command
=
(
MAV_CMD
)
this
->
command
();
if
(
_missionCommands
->
contains
(
command
))
{
foreach
(
const
MavCmdParamInfo
*
paramInfo
,
_missionCommands
->
getMavCmdInfo
(
command
,
_vehicle
)
->
paramInfoMap
())
{
MavCmdInfo
*
mavCmdInfo
=
_missionCommands
->
getMavCmdInfo
(
command
,
_vehicle
);
foreach
(
const
MavCmdParamInfo
*
paramInfo
,
mavCmdInfo
->
paramInfoMap
())
{
Fact
*
rgParamFacts
[
7
]
=
{
&
_param1Fact
,
&
_param2Fact
,
&
_param3Fact
,
&
_param4Fact
,
&
_param5Fact
,
&
_param6Fact
,
&
_param7Fact
};
rgParamFacts
[
paramInfo
->
param
()
-
1
]
->
setRawValue
(
paramInfo
->
defaultValue
());
...
...
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