summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tradeshow/iot-sensortag/mqttdataprovider.cpp24
-rw-r--r--tradeshow/iot-sensortag/mqttdataprovider.h10
-rw-r--r--tradeshow/iot-sensortag/mqttdataproviderpool.cpp4
-rw-r--r--tradeshow/iot-sensortag/mqttupdate.cpp40
-rw-r--r--tradeshow/iot-sensortag/mqttupdate.h4
5 files changed, 44 insertions, 38 deletions
diff --git a/tradeshow/iot-sensortag/mqttdataprovider.cpp b/tradeshow/iot-sensortag/mqttdataprovider.cpp
index 16bc096..17bafa0 100644
--- a/tradeshow/iot-sensortag/mqttdataprovider.cpp
+++ b/tradeshow/iot-sensortag/mqttdataprovider.cpp
@@ -154,36 +154,36 @@ void MqttDataProvider::parseMessage(const QString &content, const QString &topic
double v1, v2, v3;
char c;
stream >> v1 >> c >> v2 >> c >> v3;
- gyroscopeX_degPerSec = v1;
- gyroscopeY_degPerSec = v2;
- gyroscopeZ_degPerSec = v3;
+ gyroscopeX_degPerSec = static_cast<float>(v1);
+ gyroscopeY_degPerSec = static_cast<float>(v2);
+ gyroscopeZ_degPerSec = static_cast<float>(v3);
} else if (msgType == QStringLiteral("accel")) {
QString streamContent = content;
QTextStream stream(&streamContent);
double v1, v2, v3;
char c;
stream >> v1 >> c >> v2 >> c >> v3;
- accelometerX = v1;
- accelometerY = v2;
- accelometerZ = v3;
+ accelometerX = static_cast<float>(v1);
+ accelometerY = static_cast<float>(v2);
+ accelometerZ = static_cast<float>(v3);
} else if (msgType == QStringLiteral("magnet")) {
QString streamContent = content;
QTextStream stream(&streamContent);
double v1, v2, v3;
char c;
stream >> v1 >> c >> v2 >> c >> v3;
- magnetometerMicroT_xAxis = v1;
- magnetometerMicroT_yAxis = v2;
- magnetometerMicroT_zAxis = v3;
+ magnetometerMicroT_xAxis = static_cast<float>(v1);
+ magnetometerMicroT_yAxis = static_cast<float>(v2);
+ magnetometerMicroT_zAxis = static_cast<float>(v3);
} else if (msgType == QStringLiteral("rotation")) {
QString streamContent = content;
QTextStream stream(&streamContent);
double v1, v2, v3;
char c;
stream >> v1 >> c >> v2 >> c >> v3;
- rotation_x = v1;
- rotation_y = v2;
- rotation_z = v3;
+ rotation_x = static_cast<float>(v1);
+ rotation_y = static_cast<float>(v2);
+ rotation_z = static_cast<float>(v3);
} else if (msgType == QStringLiteral("altitude")) {
QString streamContent = content;
QTextStream stream(&streamContent);
diff --git a/tradeshow/iot-sensortag/mqttdataprovider.h b/tradeshow/iot-sensortag/mqttdataprovider.h
index 9a52332..53a4492 100644
--- a/tradeshow/iot-sensortag/mqttdataprovider.h
+++ b/tradeshow/iot-sensortag/mqttdataprovider.h
@@ -62,12 +62,12 @@ class MqttDataProvider : public SensorTagDataProvider
{
Q_OBJECT
public:
- explicit MqttDataProvider(QString id, QMqttClient *client, QObject *parent = 0);
+ explicit MqttDataProvider(QString id, QMqttClient *client, QObject *parent = nullptr);
- bool startDataFetching();
- void endDataFetching();
- QString sensorType() const;
- QString versionString() const;
+ bool startDataFetching() override;
+ void endDataFetching() override;
+ QString sensorType() const override;
+ QString versionString() const override;
void reset() override;
public slots:
diff --git a/tradeshow/iot-sensortag/mqttdataproviderpool.cpp b/tradeshow/iot-sensortag/mqttdataproviderpool.cpp
index 55cd0f7..a7408eb 100644
--- a/tradeshow/iot-sensortag/mqttdataproviderpool.cpp
+++ b/tradeshow/iot-sensortag/mqttdataproviderpool.cpp
@@ -69,7 +69,7 @@ void MqttDataProviderPool::startScanning()
emit dataProvidersChanged();
m_client->setHostname(MqttCredentials::getBroker());
- m_client->setPort((quint16)MqttCredentials::getPort());
+ m_client->setPort(static_cast<quint16>(MqttCredentials::getPort()));
m_client->setUsername(MqttCredentials::getUsername());
m_client->setPassword(MqttCredentials::getPassword());
@@ -77,7 +77,7 @@ void MqttDataProviderPool::startScanning()
auto sub = m_client->subscribe(QLatin1String("sensors/active"));
connect(sub, &QMqttSubscription::messageReceived, this, &MqttDataProviderPool::deviceUpdate);
});
- connect(m_client, &QMqttClient::disconnected, [this]() {
+ connect(m_client, &QMqttClient::disconnected, []() {
qDebug() << "Pool client disconnected";
});
m_client->connectToHost();
diff --git a/tradeshow/iot-sensortag/mqttupdate.cpp b/tradeshow/iot-sensortag/mqttupdate.cpp
index 87a8416..921825e 100644
--- a/tradeshow/iot-sensortag/mqttupdate.cpp
+++ b/tradeshow/iot-sensortag/mqttupdate.cpp
@@ -66,7 +66,7 @@ Q_DECLARE_LOGGING_CATEGORY(boot2QtDemos)
MqttUpdate::MqttUpdate(QObject *parent)
: QObject(parent)
- , m_providerPool(0)
+ , m_providerPool(nullptr)
#ifdef MQTT_TIMER_BASED_PUBLISH
, m_timerId(0)
#endif
@@ -154,9 +154,10 @@ void MqttEventHandler::uploadGyro()
SensorTagDataProvider *provider = m_providerPool->currentProvider();
if (provider) {
- const QString gyro = QString("%1_%2_%3").arg(provider->getGyroscopeX_degPerSec(), 0, 'f', ROUNDING_DECIMALS)
- .arg(provider->getGyroscopeY_degPerSec(), 0, 'f', ROUNDING_DECIMALS)
- .arg(provider->getGyroscopeZ_degPerSec(), 0, 'f', ROUNDING_DECIMALS);
+ const QString gyro = QString("%1_%2_%3")
+ .arg(double(provider->getGyroscopeX_degPerSec()), 0, 'f', ROUNDING_DECIMALS)
+ .arg(double(provider->getGyroscopeY_degPerSec()), 0, 'f', ROUNDING_DECIMALS)
+ .arg(double(provider->getGyroscopeZ_degPerSec()), 0, 'f', ROUNDING_DECIMALS);
m_client->publish(m_topicPrefix + QLatin1String("gyro"), gyro.toLocal8Bit());
}
}
@@ -169,7 +170,8 @@ void MqttEventHandler::uploadTemperature()
SensorTagDataProvider *provider = m_providerPool->currentProvider();
if (provider) {
- const QString temperature = QString("%1_%2").arg(provider->getInfraredAmbientTemperature(), 0, 'f', ROUNDING_DECIMALS)
+ const QString temperature = QString("%1_%2")
+ .arg(provider->getInfraredAmbientTemperature(), 0, 'f', ROUNDING_DECIMALS)
.arg(provider->getInfraredObjectTemperature(), 0, 'f', ROUNDING_DECIMALS);
m_client->publish(m_topicPrefix + QLatin1String("temperature"), temperature.toLocal8Bit());
}
@@ -208,7 +210,7 @@ void MqttEventHandler::uploadAltitude()
if (provider)
m_client->publish(m_topicPrefix + QLatin1String("altitude"),
- QString("%1").arg(provider->getAltitude(), 0, 'f', ROUNDING_DECIMALS).toLocal8Bit());
+ QString("%1").arg(double(provider->getAltitude()), 0, 'f', ROUNDING_DECIMALS).toLocal8Bit());
}
void MqttEventHandler::uploadBarometer()
@@ -219,7 +221,8 @@ void MqttEventHandler::uploadBarometer()
SensorTagDataProvider *provider = m_providerPool->currentProvider();
if (provider) {
- const QString baro = QString("%1_%2").arg(provider->getBarometerCelsiusTemperature(), 0, 'f', ROUNDING_DECIMALS)
+ const QString baro = QString("%1_%2")
+ .arg(provider->getBarometerCelsiusTemperature(), 0, 'f', ROUNDING_DECIMALS)
.arg(provider->getBarometer_hPa(), 0, 'f', ROUNDING_DECIMALS);
m_client->publish(m_topicPrefix + QLatin1String("barometer"), baro.toLocal8Bit());
}
@@ -233,9 +236,10 @@ void MqttEventHandler::uploadAccelerometer()
SensorTagDataProvider *provider = m_providerPool->currentProvider();
if (provider) {
- const QString accel = QString("%1_%2_%3").arg(provider->getAccelometer_xAxis(), 0, 'f', ROUNDING_DECIMALS)
- .arg(provider->getAccelometer_yAxis(), 0, 'f', ROUNDING_DECIMALS)
- .arg(provider->getAccelometer_zAxis(), 0, 'f', ROUNDING_DECIMALS);
+ const QString accel = QString("%1_%2_%3")
+ .arg(double(provider->getAccelometer_xAxis()), 0, 'f', ROUNDING_DECIMALS)
+ .arg(double(provider->getAccelometer_yAxis()), 0, 'f', ROUNDING_DECIMALS)
+ .arg(double(provider->getAccelometer_zAxis()), 0, 'f', ROUNDING_DECIMALS);
m_client->publish(m_topicPrefix + QLatin1String("accel"), accel.toLocal8Bit());
}
}
@@ -248,9 +252,10 @@ void MqttEventHandler::uploadMagnetometer()
SensorTagDataProvider *provider = m_providerPool->currentProvider();
if (provider) {
- const QString magnet = QString("%1_%2_%3").arg(provider->getMagnetometerMicroT_xAxis(), 0, 'f', ROUNDING_DECIMALS)
- .arg(provider->getMagnetometerMicroT_yAxis(), 0, 'f', ROUNDING_DECIMALS)
- .arg(provider->getMagnetometerMicroT_zAxis(), 0, 'f', ROUNDING_DECIMALS);
+ const QString magnet = QString("%1_%2_%3")
+ .arg(double(provider->getMagnetometerMicroT_xAxis()), 0, 'f', ROUNDING_DECIMALS)
+ .arg(double(provider->getMagnetometerMicroT_yAxis()), 0, 'f', ROUNDING_DECIMALS)
+ .arg(double(provider->getMagnetometerMicroT_zAxis()), 0, 'f', ROUNDING_DECIMALS);
m_client->publish(m_topicPrefix + QLatin1String("magnet"), magnet.toLocal8Bit());
}
}
@@ -263,9 +268,10 @@ void MqttEventHandler::uploadRotation()
SensorTagDataProvider *provider = m_providerPool->currentProvider();
if (provider) {
- const QString rotation = QString("%1_%2_%3").arg(provider->getRotationX(), 0, 'f', ROUNDING_DECIMALS)
- .arg(provider->getRotationY(), 0, 'f', ROUNDING_DECIMALS)
- .arg(provider->getRotationZ(), 0, 'f', ROUNDING_DECIMALS);
+ const QString rotation = QString("%1_%2_%3")
+ .arg(double(provider->getRotationX()), 0, 'f', ROUNDING_DECIMALS)
+ .arg(double(provider->getRotationY()), 0, 'f', ROUNDING_DECIMALS)
+ .arg(double(provider->getRotationZ()), 0, 'f', ROUNDING_DECIMALS);
m_client->publish(m_topicPrefix + QLatin1String("rotation"), rotation.toLocal8Bit());
}
}
@@ -358,7 +364,7 @@ MqttEventHandler::MqttEventHandler(const QString &name, QObject *parent)
m_client = new QMqttClient;
m_client->setHostname(MqttCredentials::getBroker());
- m_client->setPort(MqttCredentials::getPort());
+ m_client->setPort(static_cast<quint16>(MqttCredentials::getPort()));
m_client->setUsername(MqttCredentials::getUsername());
m_client->setPassword(MqttCredentials::getPassword());
diff --git a/tradeshow/iot-sensortag/mqttupdate.h b/tradeshow/iot-sensortag/mqttupdate.h
index 2c2d424..8be5920 100644
--- a/tradeshow/iot-sensortag/mqttupdate.h
+++ b/tradeshow/iot-sensortag/mqttupdate.h
@@ -63,7 +63,7 @@ class MqttEventHandler : public QObject
{
Q_OBJECT
public:
- explicit MqttEventHandler(const QString &name, QObject *parent = 0);
+ explicit MqttEventHandler(const QString &name, QObject *parent = nullptr);
~MqttEventHandler();
DataProviderPool *m_providerPool;
public slots:
@@ -91,7 +91,7 @@ class MqttUpdate : public QObject
{
Q_OBJECT
public:
- explicit MqttUpdate(QObject *parent = 0);
+ explicit MqttUpdate(QObject *parent = nullptr);
void setDataProviderPool(DataProviderPool *provider);