Skip to content

Q
qgroundcontrol
Commit dc492f13 authored by pixhawk's avatar pixhawk
Browse files
Options

local_position now with angles, waypointlists added

parent 6f5be5a6
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 4 deletions
src/uas/UAS.cc
View file @ dc492f13
......@@ -298,11 +298,11 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
emit valueChanged(uasId, "x", pos.x, time);
emit valueChanged(uasId, "y", pos.y, time);
emit valueChanged(uasId, "z", pos.z, time);
emit valueChanged(uasId, "vx", pos.vx, time);
emit valueChanged(uasId, "vy", pos.vy, time);
emit valueChanged(uasId, "vz", pos.vz, time);
emit valueChanged(uasId, "roll", pos.roll, time);
emit valueChanged(uasId, "pitch", pos.pitch, time);
emit valueChanged(uasId, "yaw", pos.yaw, time);
emit localPositionChanged(this, pos.x, pos.y, pos.z, time);
emit speedChanged(this, pos.vx, pos.vy, pos.vz, time);
emit speedChanged(this, pos.roll, pos.pitch, pos.yaw, time);
// Set internal state
if (!positionLock)
{
......
waypoints_8_circle.txt 0 → 100644
View file @ dc492f13
0 3.7 0.3 -0.8 0 1 1 0.1 2000
1 3.1 0.3 -0.8 0 1 0 0.1 2000
2 3.1 0.8 -0.8 0 1 0 0.1 2000
3 3.1 1.3 -0.8 0 1 0 0.1 2000
4 3.1 2 -0.8 0 1 0 0.1 2000
5 3.1 2.8 -0.8 0 1 0 0.1 2000
6 3.1 3.2 -0.8 0 1 0 0.1 2000
7 2.1 3.2 -0.8 0 1 0 0.1 2000
8 1.1 3.2 -0.8 0 1 0 0.1 2000
9 0.4 3.2 -0.8 0 1 0 0.1 2000
10 0.25 3.2 -0.8 0 1 0 0.1 2000
11 0.25 2.2 -0.8 0 1 0 0.1 2000
12 0.25 1.2 -0.8 0 1 0 0.1 2000
13 0.25 0.5 -0.8 0 1 0 0.1 2000
14 0.25 0.3 -0.8 0 1 0 0.1 2000
15 1.1 0.3 -0.8 0 1 0 0.1 2000
16 2.1 0.3 -0.8 0 1 0 0.1 2000
17 2.8 0.3 -0.8 0 1 0 0.1 2000
18 3.1 0.3 -0.8 0 1 0 0.1 2000
19 3.7 0.3 -0.8 0 1 0 0.1 2000
20 3.7 0.3 0 0 1 0 0.1 2000
waypoints_8_start_land.txt 0 → 100644
View file @ dc492f13
0 3.7 0.3 -0.8 0 1 1 0.1 2000
1 3.1 0.3 -0.8 0 1 0 0.1 2000
2 3.1 0.8 -0.8 0 1 0 0.1 2000
3 3.1 1.3 -0.8 0 1 0 0.1 2000
4 3.1 1.4 -0.8 0 1 0 0.1 2000
5 3.1 1.3 -0.8 0 1 0 0.1 2000
6 3.1 0.8 -0.8 0 1 0 0.1 2000
7 3.1 0.3 -0.8 0 1 0 0.1 2000
8 3.7 0.3 -0.8 0 1 0 0.1 2000
9 3.7 0.3 0 0 1 0 0.1 2000
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment