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
3b8a69ad
Commit
3b8a69ad
authored
Dec 27, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update android build to LinkReference changes
parent
fd6a2f90
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
10 deletions
+6
-10
BluetoothLink.cc
src/comm/BluetoothLink.cc
+4
-8
BluetoothLink.h
src/comm/BluetoothLink.h
+1
-1
LinkManager.cc
src/comm/LinkManager.cc
+1
-1
No files found.
src/comm/BluetoothLink.cc
View file @
3b8a69ad
...
...
@@ -29,24 +29,20 @@
#include "BluetoothLink.h"
#include "QGC.h"
BluetoothLink
::
BluetoothLink
(
BluetoothConfiguration
*
config
)
:
_connectState
(
false
)
BluetoothLink
::
BluetoothLink
(
SharedLinkConfigurationPointer
&
config
)
:
LinkInterface
(
config
)
,
_connectState
(
false
)
,
_targetSocket
(
NULL
)
#ifdef __ios__
,
_discoveryAgent
(
NULL
)
#endif
,
_shutDown
(
false
)
{
Q_ASSERT
(
config
!=
NULL
);
_config
=
config
;
_config
->
setLink
(
this
);
//moveToThread(this);
}
BluetoothLink
::~
BluetoothLink
()
{
// Disconnect link from configuration
_config
->
setLink
(
NULL
);
_disconnect
();
#ifdef __ios__
if
(
_discoveryAgent
)
{
...
...
src/comm/BluetoothLink.h
View file @
3b8a69ad
...
...
@@ -169,7 +169,7 @@ protected:
private:
// Links are only created/destroyed by LinkManager so constructor/destructor is not public
BluetoothLink
(
BluetoothConfiguration
*
config
);
BluetoothLink
(
SharedLinkConfigurationPointer
&
config
);
~
BluetoothLink
();
// From LinkInterface
...
...
src/comm/LinkManager.cc
View file @
3b8a69ad
...
...
@@ -493,7 +493,7 @@ void LinkManager::_updateAutoConnectLinks(void)
// Android builds only support a single serial connection. Repeatedly calling availablePorts after that one serial
// port is connected leaks file handles due to a bug somewhere in android serial code. In order to work around that
// bug after we connect the first serial port we stop probing for additional ports.
if
(
!
_
a
utoconnectConfigurations
.
count
())
{
if
(
!
_
sharedA
utoconnectConfigurations
.
count
())
{
portList
=
QGCSerialPortInfo
::
availablePorts
();
}
#else
...
...
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