From 25aa7288205ba8371466768392a3be02a5c8f5d7 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Tue, 14 Feb 2017 13:33:15 +0100 Subject: iot-sensortag: Remove unused m_services MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Neither m_services nor signals functions that use this member are used anywhere in the code so they can safely be removed. Change-Id: I3c5ff95499e5012b9c6e7d608a6feceb9d45fe7c Reviewed-by: Kari Hautamäki --- tradeshow/iot-sensortag/bluetoothdevice.cpp | 197 ++++++++++------------------ tradeshow/iot-sensortag/bluetoothdevice.h | 5 - 2 files changed, 68 insertions(+), 134 deletions(-) (limited to 'tradeshow') diff --git a/tradeshow/iot-sensortag/bluetoothdevice.cpp b/tradeshow/iot-sensortag/bluetoothdevice.cpp index 7eca64e..800a8ab 100644 --- a/tradeshow/iot-sensortag/bluetoothdevice.cpp +++ b/tradeshow/iot-sensortag/bluetoothdevice.cpp @@ -100,9 +100,7 @@ BluetoothDevice::~BluetoothDevice() { delete discoveryAgent; delete controller; - qDeleteAll(m_services); qDeleteAll(m_characteristics); - m_services.clear(); m_characteristics.clear(); } QString BluetoothDevice::getAddress() const @@ -121,11 +119,6 @@ QString BluetoothDevice::getName() const return m_deviceInfo.name(); } -QVariant BluetoothDevice::getServices() -{ - return QVariant::fromValue(m_services); -} - QVariant BluetoothDevice::getCharacteristics() { return QVariant::fromValue(m_characteristics); @@ -136,9 +129,6 @@ void BluetoothDevice::scanServices() qDeleteAll(m_characteristics); m_characteristics.clear(); emit characteristicsUpdated(); - qDeleteAll(m_services); - m_services.clear(); - emit servicesUpdated(); statusUpdated("(Connecting to device...)"); @@ -172,109 +162,94 @@ void BluetoothDevice::scanServices() void BluetoothDevice::addLowEnergyService(const QBluetoothUuid &serviceUuid) { - QLowEnergyService *service = controller->createServiceObject(serviceUuid); - if (!service) { - qWarning() << "Cannot create service for uuid"; - return; - } - ServiceInfo *serv = new ServiceInfo(service); - m_services.append(serv); - - emit servicesUpdated(); } void BluetoothDevice::serviceScanDone() { statusUpdated("(Service scan done!)"); - // force UI in case we didn't find anything - if (m_services.isEmpty()) - emit servicesUpdated(); - else { - qCDebug(boot2QtDemos) << "ServiceScan done."; - if (!irTemperatureService) - { - QBluetoothUuid uuid; - for (int i = 0; i < controller->services().count(); i++) { - QBluetoothUuid id = controller->services().at(i); - if (id.toString().contains("f000aa00-0451-4000-b000-000000000000")) { - uuid = id; - break; - } + qCDebug(boot2QtDemos) << "ServiceScan done."; + if (!irTemperatureService) + { + QBluetoothUuid uuid; + for (int i = 0; i < controller->services().count(); i++) { + QBluetoothUuid id = controller->services().at(i); + if (id.toString().contains("f000aa00-0451-4000-b000-000000000000")) { + uuid = id; + break; } - - irTemperatureService = controller->createServiceObject(uuid); - connect(irTemperatureService, &QLowEnergyService::stateChanged, this, &BluetoothDevice::temperatureDetailsDiscovered); - connect(irTemperatureService, &QLowEnergyService::characteristicChanged, this, &BluetoothDevice::characteristicsRead); - irTemperatureService->discoverDetails(); } - if (!baroService) - { - QBluetoothUuid uuid; - for (int i = 0; i < controller->services().count(); i++) { - QBluetoothUuid id = controller->services().at(i); - if (id.toString().contains("f000aa40-0451-4000-b000-000000000000")) { - uuid = id; - break; - } - } - baroService = controller->createServiceObject(uuid); - connect(baroService, &QLowEnergyService::stateChanged, this, &BluetoothDevice::barometerDetailsDiscovered); - connect(baroService, &QLowEnergyService::characteristicChanged, this, &BluetoothDevice::characteristicsRead); - baroService->discoverDetails(); + irTemperatureService = controller->createServiceObject(uuid); + connect(irTemperatureService, &QLowEnergyService::stateChanged, this, &BluetoothDevice::temperatureDetailsDiscovered); + connect(irTemperatureService, &QLowEnergyService::characteristicChanged, this, &BluetoothDevice::characteristicsRead); + irTemperatureService->discoverDetails(); + } + if (!baroService) + { + QBluetoothUuid uuid; + for (int i = 0; i < controller->services().count(); i++) { + QBluetoothUuid id = controller->services().at(i); + if (id.toString().contains("f000aa40-0451-4000-b000-000000000000")) { + uuid = id; + break; + } } - if (!humidityService) - { - QBluetoothUuid uuid; - for (int i = 0; i < controller->services().count(); i++) { - QBluetoothUuid id = controller->services().at(i); - if (id.toString().contains("f000aa20-0451-4000-b000-000000000000")) { - uuid = id; - break; - } + baroService = controller->createServiceObject(uuid); + connect(baroService, &QLowEnergyService::stateChanged, this, &BluetoothDevice::barometerDetailsDiscovered); + connect(baroService, &QLowEnergyService::characteristicChanged, this, &BluetoothDevice::characteristicsRead); + baroService->discoverDetails(); + } + if (!humidityService) + { + QBluetoothUuid uuid; + for (int i = 0; i < controller->services().count(); i++) { + QBluetoothUuid id = controller->services().at(i); + if (id.toString().contains("f000aa20-0451-4000-b000-000000000000")) { + uuid = id; + break; } - humidityService = controller->createServiceObject(uuid); - connect(humidityService, &QLowEnergyService::stateChanged, this, &BluetoothDevice::humidityDetailsDiscovered); - connect(humidityService, &QLowEnergyService::characteristicChanged, this, &BluetoothDevice::characteristicsRead); - humidityService->discoverDetails(); } - if (!lightService) - { - QBluetoothUuid uuid; - for (int i = 0; i < controller->services().count(); i++) { - QBluetoothUuid id = controller->services().at(i); - if (id.toString().contains("f000aa70-0451-4000-b000-000000000000")) { - uuid = id; - break; - } - + humidityService = controller->createServiceObject(uuid); + connect(humidityService, &QLowEnergyService::stateChanged, this, &BluetoothDevice::humidityDetailsDiscovered); + connect(humidityService, &QLowEnergyService::characteristicChanged, this, &BluetoothDevice::characteristicsRead); + humidityService->discoverDetails(); + } + if (!lightService) + { + QBluetoothUuid uuid; + for (int i = 0; i < controller->services().count(); i++) { + QBluetoothUuid id = controller->services().at(i); + if (id.toString().contains("f000aa70-0451-4000-b000-000000000000")) { + uuid = id; + break; } - lightService = controller->createServiceObject(uuid); - connect(lightService, &QLowEnergyService::stateChanged, this, &BluetoothDevice::lightIntensityDetailsDiscovered); - connect(lightService, &QLowEnergyService::characteristicChanged, this, &BluetoothDevice::characteristicsRead); - lightService->discoverDetails(); } - if (!motionService) - { - QBluetoothUuid uuid; - for (int i = 0; i < controller->services().count(); i++) { - QBluetoothUuid id = controller->services().at(i); - if (id.toString().contains("f000aa80-0451-4000-b000-000000000000")) { - uuid = id; - break; - } + + lightService = controller->createServiceObject(uuid); + connect(lightService, &QLowEnergyService::stateChanged, this, &BluetoothDevice::lightIntensityDetailsDiscovered); + connect(lightService, &QLowEnergyService::characteristicChanged, this, &BluetoothDevice::characteristicsRead); + lightService->discoverDetails(); + } + if (!motionService) + { + QBluetoothUuid uuid; + for (int i = 0; i < controller->services().count(); i++) { + QBluetoothUuid id = controller->services().at(i); + if (id.toString().contains("f000aa80-0451-4000-b000-000000000000")) { + uuid = id; + break; } - motionService = controller->createServiceObject(uuid); - connect(motionService, &QLowEnergyService::stateChanged, this, &BluetoothDevice::motionDetailsDiscovered); - connect(motionService, &QLowEnergyService::characteristicChanged, this, &BluetoothDevice::characteristicsRead); - motionService->discoverDetails(); } - attitudeChangeInterval.restart(); + motionService = controller->createServiceObject(uuid); + connect(motionService, &QLowEnergyService::stateChanged, this, &BluetoothDevice::motionDetailsDiscovered); + connect(motionService, &QLowEnergyService::characteristicChanged, this, &BluetoothDevice::characteristicsRead); + motionService->discoverDetails(); } + attitudeChangeInterval.restart(); } void BluetoothDevice::temperatureDetailsDiscovered(QLowEnergyService::ServiceState newstate) @@ -595,42 +570,6 @@ void BluetoothDevice::motionReceived(const QByteArray &value) emit motionChanged(data); } -void BluetoothDevice::connectToService(const QString &uuid) -{ - QLowEnergyService *service = 0; - for (int i = 0; i < m_services.size(); i++) { - ServiceInfo *serviceInfo = (ServiceInfo*)m_services.at(i); - if (serviceInfo->getUuid() == uuid) { - service = serviceInfo->service(); - break; - } - } - - if (!service) - return; - - qDeleteAll(m_characteristics); - m_characteristics.clear(); - emit characteristicsUpdated(); - - if (service->state() == QLowEnergyService::DiscoveryRequired) { - connect(service, SIGNAL(stateChanged(QLowEnergyService::ServiceState)), - this, SLOT(serviceDetailsDiscovered(QLowEnergyService::ServiceState))); - service->discoverDetails(); - statusUpdated("(Discovering details...)"); - return; - } - - //discovery already done - const QList chars = service->characteristics(); - foreach (const QLowEnergyCharacteristic &ch, chars) { - CharacteristicInfo *cInfo = new CharacteristicInfo(ch); - m_characteristics.append(cInfo); - } - - QTimer::singleShot(0, this, SIGNAL(characteristicsUpdated())); -} - void BluetoothDevice::deviceConnected() { setState(DeviceState::Connected); diff --git a/tradeshow/iot-sensortag/bluetoothdevice.h b/tradeshow/iot-sensortag/bluetoothdevice.h index 435fd22..a988b6b 100644 --- a/tradeshow/iot-sensortag/bluetoothdevice.h +++ b/tradeshow/iot-sensortag/bluetoothdevice.h @@ -104,7 +104,6 @@ class BluetoothDevice: public QObject Q_PROPERTY(QString deviceAddress READ getAddress CONSTANT) Q_PROPERTY(DeviceState state READ state NOTIFY stateChanged) - Q_PROPERTY(QVariant servicesList READ getServices NOTIFY servicesUpdated) Q_PROPERTY(QVariant characteristicList READ getCharacteristics NOTIFY characteristicsUpdated) Q_PROPERTY(bool useRandomAddress MEMBER randomAddress NOTIFY randomAddressChanged) @@ -119,12 +118,10 @@ public: QString getAddress() const; QString getName() const; - QVariant getServices(); QVariant getCharacteristics(); DeviceState state() const; signals: - void servicesUpdated(); void characteristicsUpdated(); void updateChanged(); void stateChanged(); @@ -138,7 +135,6 @@ signals: public slots: void scanServices(); - void connectToService(const QString &uuid); void disconnectFromDevice(); void temperatureDetailsDiscovered(QLowEnergyService::ServiceState newstate); void barometerDetailsDiscovered(QLowEnergyService::ServiceState newstate); @@ -172,7 +168,6 @@ private: double convertIrTemperatureAPIReadingToCelsius(quint16 rawReading); QBluetoothDeviceDiscoveryAgent *discoveryAgent; - QList m_services; QList m_characteristics; QString m_previousAddress; QLowEnergyController *controller; -- cgit v1.2.3