Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3d2725ba
Commit
3d2725ba
authored
May 31, 2016
by
Beat Küng
Browse files
gps read callback: avoid sleep, don't wait when data already available
parent
36abc43f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/GPS/GPSProvider.cc
View file @
3d2725ba
...
...
@@ -141,10 +141,11 @@ int GPSProvider::callback(GPSCallbackType type, void *data1, int data2)
{
switch
(
type
)
{
case
GPSCallbackType
::
readDeviceData
:
{
int
timeout
=
*
((
int
*
)
data1
);
if
(
!
_serial
->
waitForReadyRead
(
timeout
))
return
0
;
//timeout
msleep
(
10
);
//give some more time to buffer data
if
(
_serial
->
bytesAvailable
()
==
0
)
{
int
timeout
=
*
((
int
*
)
data1
);
if
(
!
_serial
->
waitForReadyRead
(
timeout
))
return
0
;
//timeout
}
return
(
int
)
_serial
->
read
((
char
*
)
data1
,
data2
);
}
case
GPSCallbackType
::
writeDeviceData
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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