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
c00e93f2
Unverified
Commit
c00e93f2
authored
Nov 13, 2017
by
Don Gagne
Committed by
GitHub
Nov 13, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5839 from DonLakeFlyer/PositionManager
Fix position updates on Android
parents
48c896bb
690283ec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
5 deletions
+24
-5
PositionManager.cpp
src/PositionManager/PositionManager.cpp
+20
-3
PositionManager.h
src/PositionManager/PositionManager.h
+4
-2
No files found.
src/PositionManager/PositionManager.cpp
View file @
c00e93f2
...
...
@@ -32,6 +32,7 @@ void QGCPositionManager::setToolbox(QGCToolbox *toolbox)
if
(
!
_defaultSource
)
{
//-- Otherwise, create a default one
_defaultSource
=
QGeoPositionInfoSource
::
createDefaultSource
(
this
);
qDebug
()
<<
_defaultSource
;
}
_simulatedSource
=
new
SimulatedPosition
();
...
...
@@ -43,7 +44,7 @@ void QGCPositionManager::setToolbox(QGCToolbox *toolbox)
setPositionSource
(
QGCPositionSource
::
GPS
);
}
void
QGCPositionManager
::
positionUpdated
(
const
QGeoPositionInfo
&
update
)
void
QGCPositionManager
::
_
positionUpdated
(
const
QGeoPositionInfo
&
update
)
{
emit
lastPositionUpdated
(
update
.
isValid
(),
QVariant
::
fromValue
(
update
.
coordinate
()));
emit
positionInfoUpdated
(
update
);
...
...
@@ -58,7 +59,12 @@ void QGCPositionManager::setPositionSource(QGCPositionManager::QGCPositionSource
{
if
(
_currentSource
!=
nullptr
)
{
_currentSource
->
stopUpdates
();
disconnect
(
_currentSource
,
SIGNAL
(
positionUpdated
(
QGeoPositionInfo
)),
this
,
SLOT
(
positionUpdated
(
QGeoPositionInfo
)));
disconnect
(
_currentSource
);
}
if
(
qgcApp
()
->
runningUnitTests
())
{
// Units test on travis fail due to lack of position source
return
;
}
switch
(
source
)
{
...
...
@@ -77,8 +83,19 @@ void QGCPositionManager::setPositionSource(QGCPositionManager::QGCPositionSource
_updateInterval
=
_currentSource
->
minimumUpdateInterval
();
_currentSource
->
setPreferredPositioningMethods
(
QGeoPositionInfoSource
::
SatellitePositioningMethods
);
_currentSource
->
setUpdateInterval
(
_updateInterval
);
connect
(
_currentSource
,
SIGNAL
(
positionUpdated
(
QGeoPositionInfo
)),
this
,
SLOT
(
positionUpdated
(
QGeoPositionInfo
)));
connect
(
_currentSource
,
&
QGeoPositionInfoSource
::
positionUpdated
,
this
,
&
QGCPositionManager
::
_positionUpdated
);
connect
(
_currentSource
,
&
QGeoPositionInfoSource
::
updateTimeout
,
this
,
&
QGCPositionManager
::
_updateTimeout
);
connect
(
_currentSource
,
SIGNAL
(
error
(
QGeoPositionInfoSource
::
Error
)),
this
,
SLOT
(
_error
(
QGeoPositionInfoSource
::
Error
)));
_currentSource
->
startUpdates
();
}
}
void
QGCPositionManager
::
_error
(
QGeoPositionInfoSource
::
Error
positioningError
)
{
qWarning
()
<<
"QGCPositionManager error"
<<
positioningError
;
}
void
QGCPositionManager
::
_updateTimeout
(
void
)
{
qWarning
()
<<
"QGCPositionManager updateTimeout"
;
}
src/PositionManager/PositionManager.h
View file @
c00e93f2
...
...
@@ -9,7 +9,7 @@
#pragma once
#include <Q
tPositioning/qgeopositioninfosource.h
>
#include <Q
GeoPositionInfoSource
>
#include <QVariant>
...
...
@@ -37,7 +37,9 @@ public:
void
setToolbox
(
QGCToolbox
*
toolbox
);
private
slots
:
void
positionUpdated
(
const
QGeoPositionInfo
&
update
);
void
_positionUpdated
(
const
QGeoPositionInfo
&
update
);
void
_error
(
QGeoPositionInfoSource
::
Error
positioningError
);
void
_updateTimeout
(
void
);
signals:
void
lastPositionUpdated
(
bool
valid
,
QVariant
lastPosition
);
...
...
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