summaryrefslogtreecommitdiffstats
path: root/tradeshow/iot-sensortag/sensortagdataproviderpool.cpp
diff options
context:
space:
mode:
authorKari Hautamäki <kari.hautamaki@qt.io>2017-02-13 10:28:20 +0200
committerTitta Heikkala <titta.heikkala@qt.io>2017-02-15 07:56:58 +0000
commit4b5beeedda5e129018c167dd0a5cd1f17fc5c246 (patch)
treeb96df903324ce8f080c9af97c98488d39aab4905 /tradeshow/iot-sensortag/sensortagdataproviderpool.cpp
parentcacd82b316c8632edde4c37e92d0c0e9747bf5d6 (diff)
iot-sensortag: Add sensor tag setup for Embedded World
- Added two sensor tags with unique capabilities by faking that each provide only a subset of available sensor data Change-Id: I9b7ad9f7b41ea7c5abaad0bc3fbe063219b19a9e Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag/sensortagdataproviderpool.cpp')
-rw-r--r--tradeshow/iot-sensortag/sensortagdataproviderpool.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/tradeshow/iot-sensortag/sensortagdataproviderpool.cpp b/tradeshow/iot-sensortag/sensortagdataproviderpool.cpp
index bb0ead1..f9edad0 100644
--- a/tradeshow/iot-sensortag/sensortagdataproviderpool.cpp
+++ b/tradeshow/iot-sensortag/sensortagdataproviderpool.cpp
@@ -119,9 +119,15 @@ void SensorTagDataProviderPool::updateProviderForCloud()
void SensorTagDataProviderPool::deviceDiscoveryFinished()
{
m_deviceScanState = false;
+ finishScanning();
emit scanFinished();
}
+void SensorTagDataProviderPool::finishScanning()
+{
+ updateProviderForCloud();
+}
+
void SensorTagDataProviderPool::btDeviceFound(const QBluetoothDeviceInfo &info)
{
qCDebug(boot2QtDemos) << "Found a Bluetooth device. Name:" << info.name() << ", addr:" << info.address().toString();
@@ -143,7 +149,6 @@ void SensorTagDataProviderPool::btDeviceFound(const QBluetoothDeviceInfo &info)
m_dataProviders.append(dataProvider);
emit providerConnected(d->getAddress());
emit dataProvidersChanged();
- updateProviderForCloud();
connect(dataProvider, &SensorTagDataProvider::stateChanged, this, &SensorTagDataProviderPool::handleStateChange);
}
}
@@ -153,14 +158,13 @@ void SensorTagDataProviderPool::handleStateChange()
{
SensorTagDataProvider *provider = static_cast<SensorTagDataProvider*>(sender());
- qCDebug(boot2QtDemos) << provider->state();
-
switch (provider->state()) {
case SensorTagDataProvider::Disconnected:
updateProviderForCloud();
emit providerDisconnected(provider->id());
break;
case SensorTagDataProvider::Connected:
+ updateProviderForCloud();
emit providerConnected(provider->id());
break;
case SensorTagDataProvider::Error: