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
e2c7f9c3
Commit
e2c7f9c3
authored
Feb 09, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2756 from DonLakeFlyer/APMTakeoff
ArduPilot takeoff mission command does not specify coordinate
parents
7891f53c
5a68fec8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
25 deletions
+20
-25
MavCmdInfoFixedWing.json
src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
+1
-1
MavCmdInfoMultiRotor.json
src/FirmwarePlugin/APM/MavCmdInfoMultiRotor.json
+1
-1
MissionControllerTest.cc
src/MissionManager/MissionControllerTest.cc
+1
-1
MockLink.cc
src/comm/MockLink.cc
+17
-22
No files found.
src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
View file @
e2c7f9c3
...
...
@@ -7,7 +7,7 @@
"rawName"
:
"MAV_CMD_NAV_TAKEOFF"
,
"friendlyName"
:
"Takeoff"
,
"description"
:
"Take off from the ground."
,
"specifiesCoordinate"
:
tru
e
,
"specifiesCoordinate"
:
fals
e
,
"friendlyEdit"
:
true
,
"category"
:
"Basic"
,
"param1"
:
{
...
...
src/FirmwarePlugin/APM/MavCmdInfoMultiRotor.json
View file @
e2c7f9c3
...
...
@@ -7,7 +7,7 @@
"rawName"
:
"MAV_CMD_NAV_TAKEOFF"
,
"friendlyName"
:
"Takeoff"
,
"description"
:
"Take off from the ground."
,
"specifiesCoordinate"
:
tru
e
,
"specifiesCoordinate"
:
fals
e
,
"friendlyEdit"
:
true
,
"category"
:
"Basic"
},
...
...
src/MissionManager/MissionControllerTest.cc
View file @
e2c7f9c3
...
...
@@ -191,7 +191,7 @@ void MissionControllerTest::_testAddWaypointWorker(MAV_AUTOPILOT firmwareType)
QVERIFY
(
item
);
QCOMPARE
(
item
->
command
(),
MavlinkQmlSingleton
::
MAV_CMD_NAV_TAKEOFF
);
QCOMPARE
(
homeItem
->
childItems
()
->
count
(),
0
);
QCOMPARE
(
homeItem
->
childItems
()
->
count
(),
firmwareType
==
MAV_AUTOPILOT_ARDUPILOTMEGA
?
1
:
0
);
QCOMPARE
(
item
->
childItems
()
->
count
(),
0
);
int
expectedLineCount
;
...
...
src/comm/MockLink.cc
View file @
e2c7f9c3
...
...
@@ -799,29 +799,24 @@ void MockLink::setMissionItemFailureMode(MockLinkMissionItemHandler::FailureMode
void
MockLink
::
_sendHomePosition
(
void
)
{
// APM stack does not yet support HOME_POSITION
if
(
_firmwareType
!=
MAV_AUTOPILOT_ARDUPILOTMEGA
)
{
mavlink_message_t
msg
;
mavlink_message_t
msg
;
float
bogus
[
4
];
bogus
[
0
]
=
0.0
f
;
bogus
[
1
]
=
0.0
f
;
bogus
[
2
]
=
0.0
f
;
bogus
[
3
]
=
0.0
f
;
mavlink_msg_home_position_pack
(
_vehicleSystemId
,
_vehicleComponentId
,
&
msg
,
(
int32_t
)(
_vehicleLatitude
*
1E7
),
(
int32_t
)(
_vehicleLongitude
*
1E7
),
(
int32_t
)(
_vehicleAltitude
*
1000
),
0.0
f
,
0.0
f
,
0.0
f
,
&
bogus
[
0
],
0.0
f
,
0.0
f
,
0.0
f
);
respondWithMavlinkMessage
(
msg
);
}
float
bogus
[
4
];
bogus
[
0
]
=
0.0
f
;
bogus
[
1
]
=
0.0
f
;
bogus
[
2
]
=
0.0
f
;
bogus
[
3
]
=
0.0
f
;
mavlink_msg_home_position_pack
(
_vehicleSystemId
,
_vehicleComponentId
,
&
msg
,
(
int32_t
)(
_vehicleLatitude
*
1E7
),
(
int32_t
)(
_vehicleLongitude
*
1E7
),
(
int32_t
)(
_vehicleAltitude
*
1000
),
0.0
f
,
0.0
f
,
0.0
f
,
&
bogus
[
0
],
0.0
f
,
0.0
f
,
0.0
f
);
respondWithMavlinkMessage
(
msg
);
}
void
MockLink
::
_sendGpsRawInt
(
void
)
...
...
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