From 4a7c0e5841b2bb69ddaef2c9620c443934d194ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Ryyn=C3=A4nen?= Date: Mon, 30 Jan 2017 16:30:13 +0200 Subject: SensorTag changed to broadcasting mode form read-resp mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sensortag now sends data according to set intervals and app only listens to signals. Timers removed as they are no longer needed. Both ambient and object temperature read and converted properly. Cloud data updated with dedicated abient and object temperatures. Version is now 1.1 (backwards compatible). Mock data reflects to reality better. Change-Id: I6a0325a513c1a054322f18e68d2b15c474db3ee5 Reviewed-by: Kari Hautamäki --- .../iot-sensortag/resources/base/ObjectTemperatureChart.qml | 2 +- tradeshow/iot-sensortag/resources/base/TemperatureChart.qml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tradeshow/iot-sensortag/resources/base') diff --git a/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml b/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml index e0e612e..11da845 100644 --- a/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml +++ b/tradeshow/iot-sensortag/resources/base/ObjectTemperatureChart.qml @@ -58,7 +58,7 @@ BaseChart { property real value function updateTemps(){ - value = sensor.infraredCelsiusTemperature.toFixed(1); + value = sensor.infraredObjectTemperature.toFixed(1); if (minValue > value) minValue = value; if (maxValue < value) diff --git a/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml b/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml index d4878a4..5a98029 100644 --- a/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml +++ b/tradeshow/iot-sensortag/resources/base/TemperatureChart.qml @@ -68,16 +68,16 @@ BaseChart { readonly property color chartColor: "#15bdff" onSensorChanged: if (sensor) { - sensor.barometerCelsiusTemperatureChanged.connect(contentItem.updateTemperatureGraph) + sensor.infraredCelsiusTemperatureChanged.connect(contentItem.updateTemperatureGraph) } - title: qsTr("Temperature") + title: qsTr("Ambient Temperature") content: Item { anchors.fill: parent function updateTemperatureGraph() { - avgTempSeries.append(temperatureSeriesIndex, sensor.barometerCelsiusTemperature); + avgTempSeries.append(temperatureSeriesIndex, sensor.infraredAmbientTemperature); if (temperatureSeriesIndex >= maxNumOfTempReadings) { avgTempSeries.remove(avgTempSeries.at(temperatureSeriesIndex-maxNumOfTempReadings)); @@ -86,7 +86,7 @@ BaseChart { } temperatureSeriesIndex++; - var value = sensor.barometerCelsiusTemperature; + var value = sensor.infraredAmbientTemperature; if (minValue > value) minValue = value; if (maxValue < value) @@ -122,7 +122,7 @@ BaseChart { Text { anchors.centerIn: parent - text: sensor ? sensor.barometerCelsiusTemperature : "" + text: sensor ? sensor.infraredAmbientTemperature : "" color: "white" } } -- cgit v1.2.3