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
eb0df28d
Commit
eb0df28d
authored
Dec 03, 2016
by
Gus Grubba
Committed by
GitHub
Dec 03, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4286 from dogmaphobic/bluetooth
Switch Bluetooth connection from a generic Rfcomm protocol...
parents
21cfa71a
bee16a67
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
BluetoothLink.cc
src/comm/BluetoothLink.cc
+10
-2
No files found.
src/comm/BluetoothLink.cc
View file @
eb0df28d
...
...
@@ -150,7 +150,7 @@ bool BluetoothLink::_hardwareConnect()
_discoveryAgent
->
start
();
#else
_createSocket
();
_targetSocket
->
connectToService
(
QBluetoothAddress
(
_config
->
device
().
address
),
QBluetoothUuid
(
QBluetoothUuid
::
Rfcomm
));
_targetSocket
->
connectToService
(
QBluetoothAddress
(
_config
->
device
().
address
),
QBluetoothUuid
(
QBluetoothUuid
::
SerialPort
));
#endif
return
true
;
}
...
...
@@ -352,9 +352,17 @@ void BluetoothConfiguration::startScan()
void
BluetoothConfiguration
::
deviceDiscovered
(
QBluetoothDeviceInfo
info
)
{
//print_device_info(info);
if
(
!
info
.
name
().
isEmpty
()
&&
info
.
isValid
())
{
#if 0
qDebug() << "Name: " << info.name();
qDebug() << "Address: " << info.address().toString();
qDebug() << "Service Classes:" << info.serviceClasses();
QList<QBluetoothUuid> uuids = info.serviceUuids();
foreach (QBluetoothUuid uuid, uuids) {
qDebug() << "Service UUID: " << uuid.toString();
}
#endif
BluetoothData
data
;
data
.
name
=
info
.
name
();
#ifdef __ios__
...
...
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