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
125ece43
Commit
125ece43
authored
May 01, 2015
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Linux build fixes.
parent
463b4852
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
5 deletions
+47
-5
Waypoint.cc
src/Waypoint.cc
+4
-1
Waypoint.h
src/Waypoint.h
+1
-0
UASWaypointManager.cc
src/uas/UASWaypointManager.cc
+42
-4
No files found.
src/Waypoint.cc
View file @
125ece43
...
...
@@ -35,6 +35,7 @@ This file is part of the QGROUNDCONTROL project
#include "Waypoint.h"
Waypoint
::
Waypoint
(
QObject
*
parent
,
quint16
id
,
double
x
,
double
y
,
...
...
@@ -49,7 +50,8 @@ Waypoint::Waypoint(
int
action
,
const
QString
&
description
)
:
_id
(
id
)
:
QObject
(
parent
)
,
_id
(
id
)
,
_x
(
x
)
,
_y
(
y
)
,
_z
(
z
)
...
...
@@ -69,6 +71,7 @@ Waypoint::Waypoint(
}
Waypoint
::
Waypoint
(
const
Waypoint
&
other
)
:
QObject
(
NULL
)
{
*
this
=
other
;
}
...
...
src/Waypoint.h
View file @
125ece43
...
...
@@ -45,6 +45,7 @@ class Waypoint : public QObject
Q_OBJECT
public:
Waypoint
(
QObject
*
parent
=
0
,
quint16
id
=
0
,
double
x
=
0
.
0
,
double
y
=
0
.
0
,
...
...
src/uas/UASWaypointManager.cc
View file @
125ece43
...
...
@@ -179,12 +179,37 @@ void UASWaypointManager::handleWaypoint(quint8 systemId, quint8 compId, mavlink_
if
(
wp
->
seq
==
current_wp_id
)
{
Waypoint
*
lwp_vo
=
new
Waypoint
(
wp
->
seq
,
wp
->
x
,
wp
->
y
,
wp
->
z
,
wp
->
param1
,
wp
->
param2
,
wp
->
param3
,
wp
->
param4
,
wp
->
autocontinue
,
wp
->
current
,
(
MAV_FRAME
)
wp
->
frame
,
(
MAV_CMD
)
wp
->
command
);
addWaypointViewOnly
(
lwp_vo
);
Waypoint
*
lwp_vo
=
new
Waypoint
(
NULL
,
wp
->
seq
,
wp
->
x
,
wp
->
y
,
wp
->
z
,
wp
->
param1
,
wp
->
param2
,
wp
->
param3
,
wp
->
param4
,
wp
->
autocontinue
,
wp
->
current
,
(
MAV_FRAME
)
wp
->
frame
,
(
MAV_CMD
)
wp
->
command
);
addWaypointViewOnly
(
lwp_vo
);
if
(
read_to_edit
==
true
)
{
Waypoint
*
lwp_ed
=
new
Waypoint
(
wp
->
seq
,
wp
->
x
,
wp
->
y
,
wp
->
z
,
wp
->
param1
,
wp
->
param2
,
wp
->
param3
,
wp
->
param4
,
wp
->
autocontinue
,
wp
->
current
,
(
MAV_FRAME
)
wp
->
frame
,
(
MAV_CMD
)
wp
->
command
);
Waypoint
*
lwp_ed
=
new
Waypoint
(
NULL
,
wp
->
seq
,
wp
->
x
,
wp
->
y
,
wp
->
z
,
wp
->
param1
,
wp
->
param2
,
wp
->
param3
,
wp
->
param4
,
wp
->
autocontinue
,
wp
->
current
,
(
MAV_FRAME
)
wp
->
frame
,
(
MAV_CMD
)
wp
->
command
);
addWaypointEditable
(
lwp_ed
,
false
);
if
(
wp
->
current
==
1
)
currentWaypointEditable
=
lwp_ed
;
}
...
...
@@ -216,7 +241,20 @@ void UASWaypointManager::handleWaypoint(quint8 systemId, quint8 compId, mavlink_
&&
wp
->
seq
<
waypointsViewOnly
.
size
()
&&
waypointsViewOnly
[
wp
->
seq
]
->
getAction
())
{
// accept single sent waypoints because they can contain updates about remaining DO_JUMP repetitions
// but only update view only side
Waypoint
*
lwp_vo
=
new
Waypoint
(
wp
->
seq
,
wp
->
x
,
wp
->
y
,
wp
->
z
,
wp
->
param1
,
wp
->
param2
,
wp
->
param3
,
wp
->
param4
,
wp
->
autocontinue
,
wp
->
current
,
(
MAV_FRAME
)
wp
->
frame
,
(
MAV_CMD
)
wp
->
command
);
Waypoint
*
lwp_vo
=
new
Waypoint
(
NULL
,
wp
->
seq
,
wp
->
x
,
wp
->
y
,
wp
->
z
,
wp
->
param1
,
wp
->
param2
,
wp
->
param3
,
wp
->
param4
,
wp
->
autocontinue
,
wp
->
current
,
(
MAV_FRAME
)
wp
->
frame
,
(
MAV_CMD
)
wp
->
command
);
waypointsViewOnly
.
replace
(
wp
->
seq
,
lwp_vo
);
emit
waypointViewOnlyListChanged
();
...
...
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