diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2017-09-20 09:37:05 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2017-09-27 06:35:27 +0000 |
| commit | bb226a8dc9b6508c8d72c67b5260b9a733f7fca1 (patch) | |
| tree | af4a24547bea34da58a66316ba09ff9ef887396c /tradeshow/iot-sensortag/main.cpp | |
| parent | cf2ec248f2c8d6fabc539f2acef4df5d3c0e8b6c (diff) | |
iot-sensortag: Add support for MQTT
Using MQTT a sensor can send its data to a broker as well as display
data from a remote MQTT broker.
Change-Id: I01f961e89b2c6d028498ce61e4087a47742b8b82
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag/main.cpp')
| -rw-r--r-- | tradeshow/iot-sensortag/main.cpp | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/tradeshow/iot-sensortag/main.cpp b/tradeshow/iot-sensortag/main.cpp index 30c8813..555d1a8 100644 --- a/tradeshow/iot-sensortag/main.cpp +++ b/tradeshow/iot-sensortag/main.cpp @@ -47,13 +47,6 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QApplication> -#include <QQmlApplicationEngine> -#include <QQuickWindow> -#include <QQmlContext> -#include <QCommandLineParser> -#include <QFontDatabase> -#include <QScreen> #if defined(RUNS_AS_HOST) #include "bluetoothdataprovider.h" @@ -67,9 +60,21 @@ #include "mockdataproviderpool.h" #ifdef AZURE_UPLOAD #include "cloudupdate.h" +#elif defined (MQTT_UPLOAD) +#include "mqttupdate.h" +#include "mqttdataprovider.h" +#include "mqttdataproviderpool.h" #endif #include "seriesstorage.h" +#include <QApplication> +#include <QQmlApplicationEngine> +#include <QQuickWindow> +#include <QQmlContext> +#include <QCommandLineParser> +#include <QFontDatabase> +#include <QScreen> + Q_DECLARE_LOGGING_CATEGORY(boot2QtDemos) Q_LOGGING_CATEGORY(boot2QtDemos, "boot2qt.demos.iot") @@ -90,6 +95,9 @@ int main(int argc, char *argv[]) parser.addHelpOption(); parser.process(app); +#if defined(MQTT_UPLOAD) + remoteProviderPool = new MqttDataProviderPool; +#endif #if defined(RUNS_AS_HOST) // localProviderPool = new MockDataProviderPool; localProviderPool = new DemoDataProviderPool; @@ -100,8 +108,13 @@ int main(int argc, char *argv[]) qmlRegisterType<DataProviderPool>("SensorTag.DataProvider", 1, 0, "DataProviderPool"); qmlRegisterType<SeriesStorage>("SensorTag.SeriesStorage", 1, 0, "SeriesStorage"); -#if defined(RUNS_AS_HOST) && defined(AZURE_UPLOAD) +#if defined(RUNS_AS_HOST) && (defined(AZURE_UPLOAD) || defined(MQTT_UPLOAD)) +#if AZURE_UPLOAD CloudUpdate update; +# else + MqttUpdate update; +# endif + update.setDataProviderPool(localProviderPool); update.restart(); #endif |