diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-11 13:26:57 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-11 13:32:21 +0300 |
commit | 444878981185912f88155f27635b509b613a48e8 (patch) | |
tree | 33506a21e7bc9189ea3b7ed1d83aef8916d7cd8e /tradeshow/iot-sensortag/resources/small | |
parent | 7f17ecb20a42dbf6ad2d994f9521e738b4b97a11 (diff) | |
parent | 3302a40a4e4a83d53493a832bc9b8486b3ad549a (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
* origin/5.10:
iot-sensortag: Add Uuid fallback for device id
iot-sensortag: Use double-click to select connection
iot-sensortag: Add logging window
iot-sensortag: Do not enable MQTT by default
Merge remote-tracking branch 'origin/5.9' into 5.10
iot-sensortag: Disable dateview in portrait mode
iot-sensortag: Show fullscreen on Android
iot-sensortag: Align font sizes
iot-sensortag: Add support for MQTT
iot-sensortag: Redesign of example
Fix typo
Doc: Bump version to 5.10.0
Doc: Bump version to 5.9.2
Change-Id: Id006d6911a42db2a493f7b3f0eb891c791a5879c
Diffstat (limited to 'tradeshow/iot-sensortag/resources/small')
-rw-r--r-- | tradeshow/iot-sensortag/resources/small/MainSmall.qml | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/tradeshow/iot-sensortag/resources/small/MainSmall.qml b/tradeshow/iot-sensortag/resources/small/MainSmall.qml index 83835e3..7528b6b 100644 --- a/tradeshow/iot-sensortag/resources/small/MainSmall.qml +++ b/tradeshow/iot-sensortag/resources/small/MainSmall.qml @@ -55,30 +55,20 @@ Item { id: main function startRescan(sensor) { - if (sensor.state === SensorTagData.NotFound) - dataProviderPool.startScanning(); - else if (sensor.state === SensorTagData.Scanning) - dataProviderPool.disconnectProvider(sensor.providerId) - else if (sensor.state !== SensorTagData.Connected) - sensor.startServiceScan(); + // ### Only do this magic when a local device is connected +// if (sensor.state === SensorTagData.NotFound) +// dataProviderPool.startScanning(); +// else if (sensor.state === SensorTagData.Scanning) +// dataProviderPool.disconnectProvider(sensor.providerId) +// else if (sensor.state !== SensorTagData.Connected) +// sensor.startServiceScan(); } anchors.fill: parent Component.onCompleted: { - dataProviderPool.startScanning(); - - // UI gets information about the intended setup of the - // sensor even though they have not been really discovered yet - ambientTemp.sensor = dataProviderPool.getProvider(SensorTagData.AmbientTemperature); - objectTemp.sensor = dataProviderPool.getProvider(SensorTagData.ObjectTemperature); - humidity.sensor = dataProviderPool.getProvider(SensorTagData.Humidity); - airPressure.sensor = dataProviderPool.getProvider(SensorTagData.AirPressure); - light.sensor = dataProviderPool.getProvider(SensorTagData.Light); - magnetometer.sensor = dataProviderPool.getProvider(SensorTagData.Magnetometer); - rotation.sensor = dataProviderPool.getProvider(SensorTagData.Rotation); - accelometer.sensor = dataProviderPool.getProvider(SensorTagData.Accelometer); - rotationMain.sensor = dataProviderPool.getProvider(SensorTagData.Rotation); + localProviderPool.startScanning(); + remoteProviderPool.startScanning(); } Column { @@ -172,6 +162,7 @@ Item { RotationPage { id: rotationMain + visible: main.width > (leftPane.width + rightPane.width + 800) anchors.top: topToolbar.bottom anchors.left: leftPane.right anchors.leftMargin: 32 |