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

Merge PR #108: SMA: fix power parsing for SunnyWebBox

master
jenkins 2023-01-17 16:38:05 +01:00
parent 806cbfe117 666a9c6fd5
commit efcad41a0c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sma/integrationpluginsma.cpp
View File

@ -562,12 +562,11 @@ void IntegrationPluginSma::onConnectedChanged(bool connected)
void IntegrationPluginSma::onPlantOverviewReceived(const QString &messageId, SunnyWebBox::Overview overview) void IntegrationPluginSma::onPlantOverviewReceived(const QString &messageId, SunnyWebBox::Overview overview)
{ {
Q_UNUSED(messageId) Q_UNUSED(messageId)
qCDebug(dcSma()) << "Plant overview received" << overview.status;
Thing *thing = m_sunnyWebBoxes.key(static_cast<SunnyWebBox *>(sender())); Thing *thing = m_sunnyWebBoxes.key(static_cast<SunnyWebBox *>(sender()));
if (!thing) if (!thing)
return; return;
qCDebug(dcSma()) << "Plant overview received for" << thing;
thing->setStateValue(sunnyWebBoxCurrentPowerStateTypeId, -overview.power); thing->setStateValue(sunnyWebBoxCurrentPowerStateTypeId, -overview.power);
thing->setStateValue(sunnyWebBoxDayEnergyProducedStateTypeId, overview.dailyYield); thing->setStateValue(sunnyWebBoxDayEnergyProducedStateTypeId, overview.dailyYield);
thing->setStateValue(sunnyWebBoxTotalEnergyProducedStateTypeId, overview.totalYield); thing->setStateValue(sunnyWebBoxTotalEnergyProducedStateTypeId, overview.totalYield);

2
sma/sunnywebbox/sunnywebbox.cpp
View File

@ -199,7 +199,7 @@ void SunnyWebBox::parseMessage(const QString &messageId, const QString &messageT
QVariantMap map = value.toMap(); QVariantMap map = value.toMap();
if (map["meta"].toString() == "GriPwr") { if (map["meta"].toString() == "GriPwr") {
overview.power = map["value"].toString().toInt(); overview.power = map["value"].toString().toDouble();
QString unit = map["unit"].toString(); QString unit = map["unit"].toString();
qCDebug(dcSma()) << "SunnyWebBox: - Power" << overview.power << unit; qCDebug(dcSma()) << "SunnyWebBox: - Power" << overview.power << unit;
} else if (map["meta"].toString() == "GriEgyTdy") { } else if (map["meta"].toString() == "GriEgyTdy") {

4
sma/sunnywebbox/sunnywebbox.h
View File

@ -45,9 +45,9 @@ class SunnyWebBox : public QObject
Q_OBJECT Q_OBJECT
public: public:
struct Overview { struct Overview {
int power; double power;
double dailyYield; double dailyYield;
int totalYield; double totalYield;
QString status; QString status;
QString error; QString error;
}; };