ETM-Schurig
/
powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #682: EQ-3, Tado: Update thermostats windowOpenDetected states

master
jenkins 2023-05-16 12:59:07 +02:00
parent 2d0dcb8c8d e3acb067b9
commit d100cfa6e7
7 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eq-3/integrationplugineq-3.cpp
View File

@ -66,7 +66,7 @@ void IntegrationPluginEQ3::discoverThings(ThingDiscoveryInfo *info)
connect(info, &QObject::destroyed, cubeDiscovery, &MaxCubeDiscovery::deleteLater);
connect(cubeDiscovery, &MaxCubeDiscovery::cubesDetected, info, [this, info, cubeDiscovery](const QList<MaxCubeDiscovery::CubeInfo> &cubeList){
connect(cubeDiscovery, &MaxCubeDiscovery::cubesDetected, info, [this, info](const QList<MaxCubeDiscovery::CubeInfo> &cubeList){
foreach (const MaxCubeDiscovery::CubeInfo &cube, cubeList) {
ThingDescriptor descriptor(cubeThingClassId, "Max! Cube LAN Gateway", cube.serialNumber);
@ -200,9 +200,9 @@ void IntegrationPluginEQ3::setupThing(ThingSetupInfo *info)
thing->setStateValue(eqivaBluetoothTargetTemperatureStateTypeId, eqivaDevice->targetTemperature());
});
// Window open state
thing->setStateValue(eqivaBluetoothWindowOpenStateTypeId, eqivaDevice->windowOpen());
thing->setStateValue(eqivaBluetoothWindowOpenDetectedStateTypeId, eqivaDevice->windowOpen());
connect(eqivaDevice, &EqivaBluetooth::windowOpenChanged, thing, [thing, eqivaDevice](){
thing->setStateValue(eqivaBluetoothWindowOpenStateTypeId, eqivaDevice->windowOpen());
thing->setStateValue(eqivaBluetoothWindowOpenDetectedStateTypeId, eqivaDevice->windowOpen());
});
// Valve open state
thing->setStateValue(eqivaBluetoothValveOpenStateTypeId, eqivaDevice->valveOpen());

3
eq-3/integrationplugineq-3.json
View File

@ -611,9 +611,8 @@
},
{
"id": "dcacdacc-ee47-43b0-9fef-1fe423e4f355",
"name": "windowOpen",
"name": "windowOpenDetected",
"displayName": "Window open detected",
"displayNameEvent": "Window open changed",
"type": "bool",
"defaultValue": false
},

2
tado/integrationplugintado.cpp
View File

@ -432,7 +432,7 @@ void IntegrationPluginTado::onZoneStateReceived(const QString &homeId, const QSt
thing->setStateValue(zoneTargetTemperatureStateTypeId, state.settingTemperature);
thing->setStateValue(zoneTemperatureStateTypeId, state.temperature);
thing->setStateValue(zoneHumidityStateTypeId, state.humidity);
thing->setStateValue(zoneWindowOpenStateTypeId, state.windowOpen);
thing->setStateValue(zoneWindowOpenDetectedStateTypeId, state.windowOpenDetected);
thing->setStateValue(zoneTadoModeStateTypeId, state.tadoMode);
}

9
tado/integrationplugintado.h
View File

@ -31,12 +31,15 @@
#ifndef INTEGRATIONPLUGINTADO_H
#define INTEGRATIONPLUGINTADO_H
#include "plugintimer.h"
#include "integrations/integrationplugin.h"
#include "network/oauth2.h"
#include "tado.h"
#include "extern-plugininfo.h"
#include <plugintimer.h>
#include <integrations/integrationplugin.h>
#include <network/oauth2.h>
#include <QHash>
#include <QTimer>
class IntegrationPluginTado : public IntegrationPlugin

5
tado/integrationplugintado.json
View File

@ -117,9 +117,8 @@
},
{
"id": "c7a04e26-bb22-406e-b117-262bdb8b9c0e",
"name": "windowOpen",
"displayName": "Window open",
"displayNameEvent": "Window open changed",
"name": "windowOpenDetected",
"displayName": "Window open detected",
"type": "bool",
"defaultValue": false
},

4
tado/tado.cpp
View File

@ -356,6 +356,7 @@ void Tado::getZoneState(const QString &homeId, const QString &zoneId)
return;
}
setConnectionStatus(true);
setAuthenticationStatus(true);
@ -365,10 +366,11 @@ void Tado::getZoneState(const QString &homeId, const QString &zoneId)
qDebug(dcTado()) << "Get Token: Recieved invalid JSON object";
return;
}
qCDebug(dcTado()) << "Zone status received:" << qUtf8Printable(data.toJson(QJsonDocument::Indented));
ZoneState state;
QVariantMap map = data.toVariant().toMap();
state.tadoMode = map["tadoMode"].toString();
state.windowOpen = map["openWindow"].toBool();
state.windowOpenDetected = map["openWindowDetected"].toBool();
QVariantMap settingsMap = map["setting"].toMap();
state.settingType = settingsMap["type"].toString();

2
tado/tado.h
View File

@ -75,7 +75,7 @@ public:
bool settingPower = false;
double temperature = false;
double humidity = false;
bool windowOpen = false;
bool windowOpenDetected = false;
double heatingPowerPercentage = false;
QString heatingPowerType;
bool overlayIsSet = false;