diff options
author | Otto Ryynänen <otto.ryynanen@qt.io> | 2017-02-03 12:55:13 +0200 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@qt.io> | 2017-02-03 12:21:58 +0000 |
commit | a1b4c4ad291ff531b6efe8fabe409dfaae3cc854 (patch) | |
tree | 9a3b0c0c0f17924276134432808221ebd0bbe46d /tradeshow/iot-sensortag/sensortagdataprovider.cpp | |
parent | 0a85dc729c5602c0914172bbf4b2b4e3171fcd85 (diff) |
RotationPage added
Added a page that has three rotating disks.
Current pictures are placeholders for final graphics.
SensorTag can be recalibrated.
Change-Id: I0666ab06e665d8c40861e170f36b09013b722973
Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag/sensortagdataprovider.cpp')
-rw-r--r-- | tradeshow/iot-sensortag/sensortagdataprovider.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/tradeshow/iot-sensortag/sensortagdataprovider.cpp b/tradeshow/iot-sensortag/sensortagdataprovider.cpp index 4d1abcd..456b42d 100644 --- a/tradeshow/iot-sensortag/sensortagdataprovider.cpp +++ b/tradeshow/iot-sensortag/sensortagdataprovider.cpp @@ -53,6 +53,7 @@ #include <QLoggingCategory> Q_DECLARE_LOGGING_CATEGORY(boot2QtDemos) +#define DEFAULT_REFRESH_INTERVAL_MS 1000 SensorTagDataProvider::SensorTagDataProvider(QObject *parent) : QObject(parent) @@ -75,12 +76,13 @@ SensorTagDataProvider::SensorTagDataProvider(QString id, QObject* parent) accelometerY(0), accelometerZ(0), /* Object is not "walking in the air" so have one axis at 1G */ - magnetometerMicroT_xAxis(-1000), + magnetometerMicroT_xAxis(-1), magnetometerMicroT_yAxis(0), magnetometerMicroT_zAxis(0), rotation_x(0), rotation_y(0), rotation_z(0), + intervalRotation(DEFAULT_REFRESH_INTERVAL_MS), m_tagType(AmbientTemperature | ObjectTemperature | Humidity | AirPressure | Light | Magnetometer | Rotation | Accelometer), m_id(id), m_state(Disconnected) @@ -201,6 +203,11 @@ float SensorTagDataProvider::getRotationZ() return rotation_z; } +int SensorTagDataProvider::getRotationUpdateInterval() +{ + return intervalRotation; +} + int SensorTagDataProvider::tagType() const { return m_tagType; @@ -223,3 +230,13 @@ void SensorTagDataProvider::setState(SensorTagDataProvider::ProviderState state) emit stateChanged(); } } + +void SensorTagDataProvider::reset() +{ + qCDebug(boot2QtDemos) << "Attempt to reset sensortag that doesn't have reset functionality implemented!"; +} + +void SensorTagDataProvider::recalibrate() +{ + reset(); +} |