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
fa87d975
Commit
fa87d975
authored
Aug 10, 2015
by
oberion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UASWaypointManager: Fixed windows specific sleep function. Cosmetic changes on the coding style
parent
21840a53
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
UASWaypointManager.cc
src/uas/UASWaypointManager.cc
+5
-5
UASWaypointManager.h
src/uas/UASWaypointManager.h
+2
-2
No files found.
src/uas/UASWaypointManager.cc
View file @
fa87d975
...
...
@@ -1217,9 +1217,9 @@ void UASWaypointManager::_stopProtocolTimerOnThisThread(void)
void
UASWaypointManager
::
_updateWPonTimer
()
{
while
(
current_state
!=
WP_IDLE
)
{
S
leep
(
100
);
}
readWaypoints
(
true
);
while
(
current_state
!=
WP_IDLE
)
{
QGC
::
SLEEP
::
ms
leep
(
100
);
}
readWaypoints
(
true
);
}
src/uas/UASWaypointManager.h
View file @
fa87d975
...
...
@@ -168,7 +168,7 @@ signals:
private
slots
:
void
_startProtocolTimerOnThisThread
(
void
);
///< Starts the protocol timer
void
_stopProtocolTimerOnThisThread
(
void
);
///< Starts the protocol timer
void
_updateWPonTimer
(
void
);
void
_updateWPonTimer
(
void
);
///< Starts requesting WP on timer timeout
private:
UAS
*
uas
;
///< Reference to the corresponding UAS
...
...
@@ -185,7 +185,7 @@ private:
QPointer
<
Waypoint
>
currentWaypointEditable
;
///< The currently used waypoint
QList
<
mavlink_mission_item_t
*>
waypoint_buffer
;
///< buffer for waypoints during communication
QTimer
protocol_timer
;
///< Timer to catch timeouts
QTimer
_updateWPlist_timer
;
///
update WP list if modified by another instance onboard
QTimer
_updateWPlist_timer
;
///<
update WP list if modified by another instance onboard
bool
standalone
;
///< If standalone is set, do not write to UAS
int
uasid
;
///< The ID of the current UAS. Retrieved via `uas->getUASID();`, stored as an `int` to match its return type.
...
...
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