ETM-Schurig/nymea-plugins
1
0
Fork 0
mirror of https://github.com/nymea/nymea-plugins.git synced 2026-10-22 14:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

tmp

Browse Source
This commit is contained in:
Simon Stürz 2025-09-09 10:31:17 +02:00
parent 453179ab53
commit c09add5c09
3 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
senec/integrationpluginsenec.cpp
View File

@ -129,9 +129,9 @@ void IntegrationPluginSenec::startPairing(ThingPairingInfo *info)
return; return;
} }
qCDebug(dcSenec()) << "Senec server is reachable. Starting the OpenID auth process" << connection->authEndpoint().toString(QUrl::FullyEncodedy); // qCDebug(dcSenec()) << "Senec server is reachable. Starting the OpenID auth process" << connection->authEndpoint().toString(QUrl::FullyEncod7edy);
info->setOAuthUrl(connection->authEndpoint()); // info->setOAuthUrl(connection->authEndpoint());
info->finish(Thing::ThingErrorNoError); // info->finish(Thing::ThingErrorNoError);
}); });
connection->initialize(); connection->initialize();
@ -228,13 +228,13 @@ void IntegrationPluginSenec::setupThing(ThingSetupInfo *info)
NetworkDeviceMonitor *monitor = hardwareManager()->networkDeviceDiscovery()->registerMonitor(thing); NetworkDeviceMonitor *monitor = hardwareManager()->networkDeviceDiscovery()->registerMonitor(thing);
m_monitors.insert(thing, monitor); m_monitors.insert(thing, monitor);
SenecStorageLan *storage = new SenecStorageLan(hardwareManager()->networkManager(), this); SenecStorageLan *storage = new SenecStorageLan(hardwareManager()->networkManager(), monitor->networkDeviceInfo().address(), this);
m_storages.insert(thing, storage); m_storages.insert(thing, storage);
storage->setAddress(monitor->networkDeviceInfo().address());
connect(monitor, &NetworkDeviceMonitor::reachableChanged, storage, [monitor, storage](bool reachable){ connect(monitor, &NetworkDeviceMonitor::reachableChanged, storage, [monitor, storage](bool reachable){
if (reachable) { if (reachable) {
storage->setAddress(monitor->networkDeviceInfo().address()); storage->setAddress(monitor->networkDeviceInfo().address());
storage->initialize();
} }
}); });
@ -303,6 +303,8 @@ void IntegrationPluginSenec::setupThing(ThingSetupInfo *info)
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
storage->initialize();
} else if (thing->thingClassId() == senecStorageThingClassId) { } else if (thing->thingClassId() == senecStorageThingClassId) {
connect(thing, &Thing::settingChanged, this, [this, thing](const ParamTypeId &paramTypeId, const QVariant &value){ connect(thing, &Thing::settingChanged, this, [this, thing](const ParamTypeId &paramTypeId, const QVariant &value){

1
senec/senecdiscovery.cpp
View File

@ -68,6 +68,7 @@ void SenecDiscovery::checkNetworkDevice(const QHostAddress &address)
qCDebug(dcSenec()) << "Discovery: Verifying" << address; qCDebug(dcSenec()) << "Discovery: Verifying" << address;
SenecStorageLan *storage = new SenecStorageLan(m_networkManager, address, this); SenecStorageLan *storage = new SenecStorageLan(m_networkManager, address, this);
storage->setAddress(address);
m_storages.append(storage); m_storages.append(storage);
connect(storage, &SenecStorageLan::initializeFinished, this, [this, storage, address](bool success){ connect(storage, &SenecStorageLan::initializeFinished, this, [this, storage, address](bool success){

69
senec/senecstoragelan.cpp
View File

@ -34,6 +34,7 @@
#include <QDataStream> #include <QDataStream>
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonParseError> #include <QJsonParseError>
#include <QNetworkRequest>
SenecStorageLan::SenecStorageLan(NetworkAccessManager *networkManager, QObject *parent) SenecStorageLan::SenecStorageLan(NetworkAccessManager *networkManager, QObject *parent)
: QObject{parent}, : QObject{parent},
@ -142,17 +143,26 @@ QString SenecStorageLan::parseString(const QString &value)
void SenecStorageLan::initialize() void SenecStorageLan::initialize()
{ {
if (m_url.isValid()) { // if (m_url.isValid()) {
qCWarning(dcSenec()) << "Cannot initialize the storage. The request URL is not valid. Maybe the IP is not known yet or invalid."; // qCWarning(dcSenec()) << "Cannot initialize the storage. The request URL is not valid. Maybe the IP is not known yet or invalid.";
emit initializeFinished(false); // emit initializeFinished(false);
return; // return;
} // }
// Verify the debug request is working // Verify the debug request is working
QVariantMap request; QVariantMap requestData;
request.insert("DEBUG", QVariantMap()); requestData.insert("DEBUG", QVariantMap());
QNetworkReply *reply = m_networkManager->post(QNetworkRequest(m_url), QJsonDocument::fromVariant(request).toJson()); m_url = QUrl(QString("https://%1/lala.cgi").arg(m_address.toString()));
QNetworkRequest request(m_url);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QByteArray data = QJsonDocument::fromVariant(requestData).toJson(QJsonDocument::Compact);
qCDebug(dcSenec()) << "POST" << m_url.toString() << m_address.toString() << qUtf8Printable(data);
QNetworkReply *reply = m_networkManager->post(request, data);
connect(reply, &QNetworkReply::sslErrors, this, &SenecStorageLan::ignoreSslErrors); connect(reply, &QNetworkReply::sslErrors, this, &SenecStorageLan::ignoreSslErrors);
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, this, [this, reply] { connect(reply, &QNetworkReply::finished, this, [this, reply] {
@ -190,15 +200,18 @@ void SenecStorageLan::initialize()
// Request basic information // Request basic information
QVariantMap request; QVariantMap requestData;
QVariantMap factoryMap; QVariantMap factoryMap;
factoryMap.insert("DEVICE_ID", QString()); factoryMap.insert("DEVICE_ID", QString());
factoryMap.insert("DESIGN_CAPACITY", QString()); factoryMap.insert("DESIGN_CAPACITY", QString());
factoryMap.insert("MAX_CHARGE_POWER_DC", QString()); factoryMap.insert("MAX_CHARGE_POWER_DC", QString());
factoryMap.insert("MAX_DISCHARGE_POWER_DC", QString()); factoryMap.insert("MAX_DISCHARGE_POWER_DC", QString());
request.insert("FACTORY", factoryMap); requestData.insert("FACTORY", factoryMap);
QNetworkReply *reply = m_networkManager->post(QNetworkRequest(m_url), QJsonDocument::fromVariant(request).toJson()); QNetworkRequest request(m_url);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QNetworkReply *reply = m_networkManager->post(QNetworkRequest(m_url), QJsonDocument::fromVariant(requestData).toJson());
connect(reply, &QNetworkReply::sslErrors, this, &SenecStorageLan::ignoreSslErrors); connect(reply, &QNetworkReply::sslErrors, this, &SenecStorageLan::ignoreSslErrors);
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, this, [this, reply] { connect(reply, &QNetworkReply::finished, this, [this, reply] {
@ -243,13 +256,13 @@ void SenecStorageLan::initialize()
void SenecStorageLan::update() void SenecStorageLan::update()
{ {
if (m_url.isValid()) { // if (m_url.isValid()) {
qCDebug(dcSenec()) << "Cannot update the storage. The request URL is not valid. Maybe the IP is not known yet or invalid."; // qCDebug(dcSenec()) << "Cannot update the storage. The request URL is not valid. Maybe the IP is not known yet or invalid.";
emit updatedFinished(false); // emit updatedFinished(false);
return; // return;
} // }
QVariantMap request; QVariantMap requestData;
QVariantMap energyMap; QVariantMap energyMap;
energyMap.insert("GUI_BAT_DATA_POWER", QString()); energyMap.insert("GUI_BAT_DATA_POWER", QString());
@ -258,9 +271,14 @@ void SenecStorageLan::update()
energyMap.insert("GUI_HOUSE_POW", QString()); energyMap.insert("GUI_HOUSE_POW", QString());
energyMap.insert("GUI_GRID_POW", QString()); energyMap.insert("GUI_GRID_POW", QString());
request.insert("ENERGY", energyMap); requestData.insert("ENERGY", energyMap);
QNetworkReply *reply = m_networkManager->post(QNetworkRequest(m_url), QJsonDocument::fromVariant(request).toJson()); m_url = QUrl(QString("https://%1/lala.cgi").arg(m_address.toString()));
QNetworkRequest request(m_url);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QNetworkReply *reply = m_networkManager->post(request, QJsonDocument::fromVariant(requestData).toJson());
connect(reply, &QNetworkReply::sslErrors, this, &SenecStorageLan::ignoreSslErrors); connect(reply, &QNetworkReply::sslErrors, this, &SenecStorageLan::ignoreSslErrors);
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, this, [this, reply] { connect(reply, &QNetworkReply::finished, this, [this, reply] {
@ -292,7 +310,7 @@ void SenecStorageLan::update()
m_batteryPower = parseFloat(energyResponseMap.value("GUI_BAT_DATA_POWER").toString()); m_batteryPower = parseFloat(energyResponseMap.value("GUI_BAT_DATA_POWER").toString());
m_batteryLevel = parseFloat(energyResponseMap.value("GUI_BAT_DATA_FUEL_CHARGE").toString()); m_batteryLevel = parseFloat(energyResponseMap.value("GUI_BAT_DATA_FUEL_CHARGE").toString());
m_gridPower = parseFloat(energyResponseMap.value("GUI_GRID_POW").toString()); m_gridPower = parseFloat(energyResponseMap.value("GUI_GRID_POW").toString());
m_inverterPower = parseFloat(energyResponseMap.value("GUI_INVERTER_POWER").toString()); m_inverterPower = -1* parseFloat(energyResponseMap.value("GUI_INVERTER_POWER").toString());
setAvailable(true); setAvailable(true);
@ -307,16 +325,7 @@ void SenecStorageLan::update()
void SenecStorageLan::updateUrl() void SenecStorageLan::updateUrl()
{ {
QUrl url; m_url = QUrl(QString("https://%1/lala.cgi").arg(m_address.toString()));
if (m_address.isNull()) {
m_url = url;
return;
}
url.setScheme("https");
url.setHost(m_address.toString());
url.setPath("lala.cgi");
m_url = url;
} }
void SenecStorageLan::setAvailable(bool available) void SenecStorageLan::setAvailable(bool available)