From b4e70ef769c5e8716607e6ebb99c425cd9907d2a Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 7 Mar 2014 12:40:46 +0100 Subject: Improve BtTestUI device and service discovery output This was recently used to debug Androids buggy discovery code. Change-Id: I6c3eca85a650d6fbb853d2cfc8ee73b434b5e7a9 Reviewed-by: Nedim Hadzic Reviewed-by: Alex Blasche --- tests/bttestui/btlocaldevice.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'tests/bttestui') diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp index 22a89275..3a9b52b5 100644 --- a/tests/bttestui/btlocaldevice.cpp +++ b/tests/bttestui/btlocaldevice.cpp @@ -271,9 +271,11 @@ void BtLocalDevice::stopServiceDiscovery() void BtLocalDevice::serviceDiscovered(const QBluetoothServiceInfo &info) { - + QString classIds; + foreach (const QBluetoothUuid uuid, info.serviceClassUuids()) + classIds += uuid.toString() + QLatin1Char(' '); qDebug() << "$$ Found new service" << info.device().address().toString() - << info.serviceUuid() << info.serviceName() << info.serviceDescription(); + << info.serviceUuid() << info.serviceName() << classIds; if (info.serviceUuid() == QBluetoothUuid(QString(TEST_SERVICE_UUID)) || info.serviceClassUuids().contains(QBluetoothUuid(QString(TEST_SERVICE_UUID)))) @@ -314,6 +316,15 @@ void BtLocalDevice::serviceDiscoveryError(QBluetoothServiceDiscoveryAgent::Error void BtLocalDevice::dumpServiceDiscovery() { + if (deviceAgent) { + qDebug() << "Device Discovery active:" << deviceAgent->isActive(); + qDebug() << "Error:" << deviceAgent->error() << deviceAgent->errorString(); + QList list = deviceAgent->discoveredDevices(); + qDebug() << "Discovered Devices:" << list.count(); + + foreach (const QBluetoothDeviceInfo &info, list) + qDebug() << info.name() << info.address().toString(); + } if (serviceAgent) { qDebug() << "Service Discovery active:" << serviceAgent->isActive(); qDebug() << "Error:" << serviceAgent->error() << serviceAgent->errorString(); -- cgit v1.2.3