Tado: Format source using clang-format
Simon Stürz
parent
4e9c5501d6
commit
616f660c9f
|
|
@ -29,9 +29,9 @@
|
|||
#include <network/networkaccessmanager.h>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QUrlQuery>
|
||||
#include <QJsonDocument>
|
||||
#include <QTimer>
|
||||
#include <QUrlQuery>
|
||||
#include <QtMath>
|
||||
|
||||
namespace {
|
||||
|
|
@ -43,7 +43,7 @@ void finishPendingActions(const QList<ThingActionInfo *> &actions, Thing::ThingE
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
IntegrationPluginTado::IntegrationPluginTado()
|
||||
{
|
||||
|
|
@ -91,9 +91,7 @@ void IntegrationPluginTado::queueOverlayChange(ThingActionInfo *info, const QStr
|
|||
pending.dirty = true;
|
||||
pending.pendingActions.append(info);
|
||||
|
||||
connect(info, &ThingActionInfo::aborted, this, [this, info]() {
|
||||
removePendingAction(info);
|
||||
});
|
||||
connect(info, &ThingActionInfo::aborted, this, [this, info]() { removePendingAction(info); });
|
||||
|
||||
if (!m_stateSyncTimer.isActive()) {
|
||||
m_stateSyncTimer.start();
|
||||
|
|
@ -110,10 +108,7 @@ void IntegrationPluginTado::removePendingAction(ThingActionInfo *info)
|
|||
}
|
||||
}
|
||||
|
||||
void IntegrationPluginTado::init()
|
||||
{
|
||||
|
||||
}
|
||||
void IntegrationPluginTado::init() {}
|
||||
|
||||
void IntegrationPluginTado::startPairing(ThingPairingInfo *info)
|
||||
{
|
||||
|
|
@ -139,8 +134,6 @@ void IntegrationPluginTado::startPairing(ThingPairingInfo *info)
|
|||
m_unfinishedTadoAccounts.take(info->thingId())->deleteLater();
|
||||
});
|
||||
|
||||
|
||||
|
||||
qCDebug(dcTado()) << "Tado server is reachable. Starting the OAuth pairing process using" << tado->loginUrl();
|
||||
info->setOAuthUrl(QUrl(tado->loginUrl()));
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
|
|
@ -185,7 +178,6 @@ void IntegrationPluginTado::setupThing(ThingSetupInfo *info)
|
|||
Thing *thing = info->thing();
|
||||
|
||||
if (thing->thingClassId() == tadoAccountThingClassId) {
|
||||
|
||||
qCDebug(dcTado) << "Setting up Tado account" << thing->name() << thing->params();
|
||||
|
||||
Tado *tado = nullptr;
|
||||
|
|
@ -205,7 +197,6 @@ void IntegrationPluginTado::setupThing(ThingSetupInfo *info)
|
|||
pluginStorage()->setValue("refreshToken", tado->refreshToken());
|
||||
pluginStorage()->endGroup();
|
||||
} else {
|
||||
|
||||
// Load refresh token
|
||||
pluginStorage()->beginGroup(thing->id().toString());
|
||||
QString refreshToken = pluginStorage()->value("refreshToken").toString();
|
||||
|
|
@ -400,7 +391,6 @@ void IntegrationPluginTado::executeAction(ThingActionInfo *info)
|
|||
}
|
||||
queueOverlayChange(info, homeId, zoneId, desired);
|
||||
} else if (action.actionTypeId() == zoneTargetTemperatureActionTypeId) {
|
||||
|
||||
double temperature = action.param(zoneTargetTemperatureActionTargetTemperatureParamTypeId).value().toDouble();
|
||||
OverlayState desired;
|
||||
if (temperature <= 0) {
|
||||
|
|
@ -565,8 +555,7 @@ void IntegrationPluginTado::onRequestExecuted(QUuid requestId, bool success)
|
|||
}
|
||||
|
||||
PendingRequest request = m_pendingRequests.take(requestId);
|
||||
finishPendingActions(request.actions,
|
||||
success ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareNotAvailable);
|
||||
finishPendingActions(request.actions, success ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareNotAvailable);
|
||||
|
||||
if (!m_pendingOverlayChanges.contains(request.zoneKey)) {
|
||||
return;
|
||||
|
|
@ -604,13 +593,11 @@ void IntegrationPluginTado::onZonesReceived(const QString &homeId, QList<Tado::Z
|
|||
Tado *tado = static_cast<Tado *>(sender());
|
||||
|
||||
if (m_tadoAccounts.values().contains(tado)) {
|
||||
|
||||
Thing *parentDevice = myThings().findById(m_tadoAccounts.key(tado));
|
||||
qCDebug(dcTado()) << "Zones received:" << zones.count() << parentDevice->name();
|
||||
|
||||
ThingDescriptors descriptors;
|
||||
foreach (Tado::Zone zone, zones) {
|
||||
|
||||
ThingDescriptor descriptor(zoneThingClassId, zone.name, "Type:" + zone.type, parentDevice->id());
|
||||
ParamList params;
|
||||
params.append(Param(zoneThingHomeIdParamTypeId, homeId));
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@
|
|||
#define INTEGRATIONPLUGINTADO_H
|
||||
|
||||
#include <integrations/integrationplugin.h>
|
||||
#include <plugintimer.h>
|
||||
#include <network/oauth2.h>
|
||||
#include <plugintimer.h>
|
||||
|
||||
#include <QHash>
|
||||
#include <QList>
|
||||
|
|
@ -56,13 +56,15 @@ public:
|
|||
void executeAction(ThingActionInfo *info) override;
|
||||
|
||||
private:
|
||||
struct OverlayState {
|
||||
struct OverlayState
|
||||
{
|
||||
bool deleteOverlay = false;
|
||||
bool power = false;
|
||||
double temperature = 0.0;
|
||||
};
|
||||
|
||||
struct PendingOverlayChange {
|
||||
struct PendingOverlayChange
|
||||
{
|
||||
ThingId accountThingId;
|
||||
QString homeId;
|
||||
QString zoneId;
|
||||
|
|
@ -74,7 +76,8 @@ private:
|
|||
QList<ThingActionInfo *> pendingActions;
|
||||
};
|
||||
|
||||
struct PendingRequest {
|
||||
struct PendingRequest
|
||||
{
|
||||
QString zoneKey;
|
||||
QList<ThingActionInfo *> actions;
|
||||
OverlayState sentState;
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@
|
|||
#include "tado.h"
|
||||
#include "extern-plugininfo.h"
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QUrlQuery>
|
||||
|
||||
Tado::Tado(NetworkAccessManager *networkManager, QObject *parent) :
|
||||
QObject(parent),
|
||||
m_networkManager(networkManager)
|
||||
Tado::Tado(NetworkAccessManager *networkManager, QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_networkManager(networkManager)
|
||||
{
|
||||
m_baseControlUrl = "https://my.tado.com/api/v2";
|
||||
m_baseAuthorizationUrl = "https://login.tado.com/oauth2";
|
||||
|
|
@ -68,7 +68,6 @@ bool Tado::connected()
|
|||
return m_connectionStatus;
|
||||
}
|
||||
|
||||
|
||||
QString Tado::loginUrl() const
|
||||
{
|
||||
return m_loginUrl;
|
||||
|
|
@ -112,7 +111,6 @@ void Tado::getLoginUrl()
|
|||
QNetworkReply *reply = m_networkManager->post(request, payload);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
// Check HTTP status code
|
||||
if (status != 200 || reply->error() != QNetworkReply::NoError) {
|
||||
|
|
@ -157,7 +155,6 @@ void Tado::getLoginUrl()
|
|||
});
|
||||
}
|
||||
|
||||
|
||||
void Tado::getAccessToken()
|
||||
{
|
||||
QNetworkRequest request = QNetworkRequest(QUrl(m_baseAuthorizationUrl + "/token"));
|
||||
|
|
@ -175,12 +172,10 @@ void Tado::getAccessToken()
|
|||
QNetworkReply *reply = m_networkManager->post(request, payload);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, this] {
|
||||
|
||||
QByteArray data = reply->readAll();
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
// Check HTTP status code
|
||||
if (status != 200 || reply->error() != QNetworkReply::NoError) {
|
||||
|
||||
emit connectionError(reply->error());
|
||||
|
||||
if (reply->error() == QNetworkReply::HostNotFoundError)
|
||||
|
|
@ -216,7 +211,6 @@ void Tado::getAccessToken()
|
|||
emit refreshTokenReceived(m_refreshToken);
|
||||
}
|
||||
|
||||
|
||||
setAuthenticationStatus(true);
|
||||
|
||||
// Refresh 10 sekonds before expiration
|
||||
|
|
@ -244,7 +238,6 @@ void Tado::getHomes()
|
|||
//qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList();
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
|
||||
// Check HTTP status code
|
||||
|
|
@ -312,7 +305,6 @@ void Tado::getZones(const QString &homeId)
|
|||
//qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList();
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, homeId, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
|
||||
// Check HTTP status code
|
||||
|
|
@ -369,7 +361,6 @@ void Tado::getZoneState(const QString &homeId, const QString &zoneId)
|
|||
//qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList();
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, homeId, zoneId, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
|
||||
// Check HTTP status code
|
||||
|
|
@ -386,7 +377,6 @@ void Tado::getZoneState(const QString &homeId, const QString &zoneId)
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
setConnectionStatus(true);
|
||||
setAuthenticationStatus(true);
|
||||
|
||||
|
|
@ -454,13 +444,13 @@ QUuid Tado::setOverlay(const QString &homeId, const QString &zoneId, bool power,
|
|||
else
|
||||
powerString = "OFF";
|
||||
|
||||
body.append("{\"setting\":{\"type\":\"HEATING\",\"power\":\"" + powerString + "\",\"temperature\":{\"celsius\":" + QVariant(targetTemperature).toByteArray() + "}},\"termination\":{\"type\":\"MANUAL\"}}");
|
||||
body.append("{\"setting\":{\"type\":\"HEATING\",\"power\":\"" + powerString + "\",\"temperature\":{\"celsius\":" + QVariant(targetTemperature).toByteArray()
|
||||
+ "}},\"termination\":{\"type\":\"MANUAL\"}}");
|
||||
|
||||
//qCDebug(dcTado()) << "Sending request" << body;
|
||||
QNetworkReply *reply = m_networkManager->put(request, body);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [homeId, zoneId, requestId, reply, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
if (status != 200 || reply->error() != QNetworkReply::NoError) {
|
||||
emit requestExecuted(requestId, false);
|
||||
|
|
@ -525,10 +515,8 @@ QUuid Tado::deleteOverlay(const QString &homeId, const QString &zoneId)
|
|||
QNetworkReply *reply = m_networkManager->deleteResource(request);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [homeId, zoneId, requestId, reply, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
if (status < 200 || status > 210 || reply->error() != QNetworkReply::NoError) {
|
||||
|
||||
emit requestExecuted(requestId, false);
|
||||
emit connectionError(reply->error());
|
||||
|
||||
|
|
@ -590,7 +578,6 @@ void Tado::requestAuthenticationToken()
|
|||
QNetworkReply *reply = m_networkManager->post(request, payload);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
if (status != 200 || reply->error() != QNetworkReply::NoError) {
|
||||
qCDebug(dcTado()) << "Request error:" << status << "Retrying:" << m_pollAuthenticationCount << "/" << m_pollAuthenticationLimit;
|
||||
|
|
@ -643,7 +630,6 @@ void Tado::setAuthenticationStatus(bool status)
|
|||
|
||||
if (!status)
|
||||
m_refreshTimer.stop();
|
||||
|
||||
}
|
||||
|
||||
void Tado::setConnectionStatus(bool status)
|
||||
|
|
|
|||
15
tado/tado.h
15
tado/tado.h
|
|
@ -25,8 +25,8 @@
|
|||
#ifndef TADO_H
|
||||
#define TADO_H
|
||||
|
||||
#include <network/networkaccessmanager.h>
|
||||
#include <integrations/thing.h>
|
||||
#include <network/networkaccessmanager.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
|
|
@ -36,13 +36,15 @@ class Tado : public QObject
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
struct Zone {
|
||||
struct Zone
|
||||
{
|
||||
QString id;
|
||||
QString name;
|
||||
QString type;
|
||||
};
|
||||
|
||||
struct Overlay {
|
||||
struct Overlay
|
||||
{
|
||||
bool power;
|
||||
double temperature;
|
||||
QString zoneType;
|
||||
|
|
@ -50,7 +52,8 @@ public:
|
|||
QString tadoMode;
|
||||
};
|
||||
|
||||
struct ZoneState {
|
||||
struct ZoneState
|
||||
{
|
||||
bool connected = false;
|
||||
bool power = false;
|
||||
QString tadoMode;
|
||||
|
|
@ -68,7 +71,8 @@ public:
|
|||
QString overlayType;
|
||||
};
|
||||
|
||||
struct Home {
|
||||
struct Home
|
||||
{
|
||||
QString id;
|
||||
QString name;
|
||||
};
|
||||
|
|
@ -141,7 +145,6 @@ signals:
|
|||
void zoneStateReceived(const QString &homeId, const QString &zoneId, Tado::ZoneState sate);
|
||||
void overlayReceived(const QString &homeId, const QString &zoneId, const Tado::Overlay &overlay);
|
||||
void connectionError(QNetworkReply::NetworkError error);
|
||||
|
||||
};
|
||||
|
||||
#endif // TADO_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue