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
3d16f990
Commit
3d16f990
authored
Jun 28, 2012
by
Jessica
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug 31. Removed redundant uas check in UASWaypointManager.
parent
44d3d10d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
7 deletions
+14
-7
UASWaypointManager.cc
src/uas/UASWaypointManager.cc
+14
-7
No files found.
src/uas/UASWaypointManager.cc
View file @
3d16f990
...
...
@@ -894,7 +894,8 @@ void UASWaypointManager::sendWaypointClearAll()
emit
updateStatusString
(
QString
(
"Clearing waypoint list..."
));
mavlink_msg_mission_clear_all_encode
(
uas
->
mavlink
->
getSystemId
(),
uas
->
mavlink
->
getComponentId
(),
&
message
,
&
wpca
);
if
(
uas
)
uas
->
sendMessage
(
message
);
// if (uas)
uas
->
sendMessage
(
message
);
QGC
::
SLEEP
::
msleep
(
PROTOCOL_DELAY_MS
);
// // qDebug() << "sent waypoint clear all to ID " << wpca.target_system;
...
...
@@ -913,7 +914,8 @@ void UASWaypointManager::sendWaypointSetCurrent(quint16 seq)
emit
updateStatusString
(
QString
(
"Updating target waypoint..."
));
mavlink_msg_mission_set_current_encode
(
uas
->
mavlink
->
getSystemId
(),
uas
->
mavlink
->
getComponentId
(),
&
message
,
&
wpsc
);
if
(
uas
)
uas
->
sendMessage
(
message
);
// if (uas)
uas
->
sendMessage
(
message
);
QGC
::
SLEEP
::
msleep
(
PROTOCOL_DELAY_MS
);
// // qDebug() << "sent waypoint set current (" << wpsc.seq << ") to ID " << wpsc.target_system;
...
...
@@ -933,7 +935,8 @@ void UASWaypointManager::sendWaypointCount()
emit
updateStatusString
(
QString
(
"Starting to transmit waypoints..."
));
mavlink_msg_mission_count_encode
(
uas
->
mavlink
->
getSystemId
(),
uas
->
mavlink
->
getComponentId
(),
&
message
,
&
wpc
);
if
(
uas
)
uas
->
sendMessage
(
message
);
//if
(
uas
)
uas
->
sendMessage
(
message
);
QGC
::
SLEEP
::
msleep
(
PROTOCOL_DELAY_MS
);
// // qDebug() << "sent waypoint count (" << wpc.count << ") to ID " << wpc.target_system;
...
...
@@ -951,7 +954,8 @@ void UASWaypointManager::sendWaypointRequestList()
emit
updateStatusString
(
QString
(
"Requesting waypoint list..."
));
mavlink_msg_mission_request_list_encode
(
uas
->
mavlink
->
getSystemId
(),
uas
->
mavlink
->
getComponentId
(),
&
message
,
&
wprl
);
if
(
uas
)
uas
->
sendMessage
(
message
);
// if (uas)
uas
->
sendMessage
(
message
);
QGC
::
SLEEP
::
msleep
(
PROTOCOL_DELAY_MS
);
// // qDebug() << "sent waypoint list request to ID " << wprl.target_system;
...
...
@@ -972,7 +976,8 @@ void UASWaypointManager::sendWaypointRequest(quint16 seq)
emit
updateStatusString
(
QString
(
"Retrieving waypoint ID %1 of %2 total"
).
arg
(
wpr
.
seq
).
arg
(
current_count
));
mavlink_msg_mission_request_encode
(
uas
->
mavlink
->
getSystemId
(),
uas
->
mavlink
->
getComponentId
(),
&
message
,
&
wpr
);
if
(
uas
)
uas
->
sendMessage
(
message
);
//if (uas)
uas
->
sendMessage
(
message
);
QGC
::
SLEEP
::
msleep
(
PROTOCOL_DELAY_MS
);
// // qDebug() << "sent waypoint request (" << wpr.seq << ") to ID " << wpr.target_system;
...
...
@@ -998,7 +1003,8 @@ void UASWaypointManager::sendWaypoint(quint16 seq)
// // qDebug() << "sent waypoint (" << wp->seq << ") to ID " << wp->target_system<<" WP Buffer count: "<<waypoint_buffer.count();
mavlink_msg_mission_item_encode
(
uas
->
mavlink
->
getSystemId
(),
uas
->
mavlink
->
getComponentId
(),
&
message
,
wp
);
if
(
uas
)
uas
->
sendMessage
(
message
);
// if (uas)
uas
->
sendMessage
(
message
);
QGC
::
SLEEP
::
msleep
(
PROTOCOL_DELAY_MS
);
}
}
...
...
@@ -1014,7 +1020,8 @@ void UASWaypointManager::sendWaypointAck(quint8 type)
wpa
.
type
=
type
;
mavlink_msg_mission_ack_encode
(
uas
->
mavlink
->
getSystemId
(),
uas
->
mavlink
->
getComponentId
(),
&
message
,
&
wpa
);
if
(
uas
)
uas
->
sendMessage
(
message
);
// if (uas)
uas
->
sendMessage
(
message
);
QGC
::
SLEEP
::
msleep
(
PROTOCOL_DELAY_MS
);
// // qDebug() << "sent waypoint ack (" << wpa.type << ") to ID " << wpa.target_system;
...
...
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