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

Fix power measurment divisor

Browse Source
This commit is contained in:
Simon Stürz 2022-01-14 12:25:28 +01:00
parent c4ec1ee6c6
commit 07d6bfc770
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sma/speedwireinverter.cpp
View File

@ -739,7 +739,7 @@ void SpeedwireInverter::processAcTotalPowerResponse(const QByteArray &response)
if (measurementId == 0x263f00 && measurmentNumber == 0x01) { if (measurementId == 0x263f00 && measurmentNumber == 0x01) {
quint32 totalAcPower; quint32 totalAcPower;
stream >> totalAcPower; stream >> totalAcPower;
m_totalAcPower = readValue(totalAcPower, 1000.0); m_totalAcPower = readValue(totalAcPower);
qCDebug(dcSma()) << "Inverter: Total AC power" << m_totalAcPower << "W"; qCDebug(dcSma()) << "Inverter: Total AC power" << m_totalAcPower << "W";
readUntilEndOfMeasurement(stream); readUntilEndOfMeasurement(stream);
} }
@ -788,13 +788,13 @@ void SpeedwireInverter::processDcPowerResponse(const QByteArray &response)
if (measurementId == 0x251e00 && measurmentNumber == 0x01) { if (measurementId == 0x251e00 && measurmentNumber == 0x01) {
quint32 powerMpp1; quint32 powerMpp1;
stream >> powerMpp1; stream >> powerMpp1;
m_powerDcMpp1 = readValue(powerMpp1, 1000.0); m_powerDcMpp1 = readValue(powerMpp1);
qCDebug(dcSma()) << "Inverter: DC power MPP1" << m_powerDcMpp1 << "W"; qCDebug(dcSma()) << "Inverter: DC power MPP1" << m_powerDcMpp1 << "W";
readUntilEndOfMeasurement(stream); readUntilEndOfMeasurement(stream);
} else if (measurementId == 0x251e00 && measurmentNumber == 0x02) { } else if (measurementId == 0x251e00 && measurmentNumber == 0x02) {
quint32 powerMpp2; quint32 powerMpp2;
stream >> powerMpp2; stream >> powerMpp2;
m_powerDcMpp2 = readValue(powerMpp2, 1000.0); m_powerDcMpp2 = readValue(powerMpp2);
qCDebug(dcSma()) << "Inverter: DC power MPP2" << m_powerDcMpp2 << "W"; qCDebug(dcSma()) << "Inverter: DC power MPP2" << m_powerDcMpp2 << "W";
readUntilEndOfMeasurement(stream); readUntilEndOfMeasurement(stream);
} }

2
sma/speedwireinverter.h
View File

@ -184,7 +184,7 @@ private:
void processInverterStatusResponse(const QByteArray &response); void processInverterStatusResponse(const QByteArray &response);
void readUntilEndOfMeasurement(QDataStream &stream); void readUntilEndOfMeasurement(QDataStream &stream);
double readValue(quint32 value, double divisor); double readValue(quint32 value, double divisor = 1.0);
void setReachable(bool reachable); void setReachable(bool reachable);