From 07d6bfc77064802872f7aac06a563eaf0d05fce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 14 Jan 2022 12:25:28 +0100 Subject: [PATCH] Fix power measurment divisor --- sma/speedwireinverter.cpp | 6 +++--- sma/speedwireinverter.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sma/speedwireinverter.cpp b/sma/speedwireinverter.cpp index 24c90b06..ef3fc805 100644 --- a/sma/speedwireinverter.cpp +++ b/sma/speedwireinverter.cpp @@ -739,7 +739,7 @@ void SpeedwireInverter::processAcTotalPowerResponse(const QByteArray &response) if (measurementId == 0x263f00 && measurmentNumber == 0x01) { quint32 totalAcPower; stream >> totalAcPower; - m_totalAcPower = readValue(totalAcPower, 1000.0); + m_totalAcPower = readValue(totalAcPower); qCDebug(dcSma()) << "Inverter: Total AC power" << m_totalAcPower << "W"; readUntilEndOfMeasurement(stream); } @@ -788,13 +788,13 @@ void SpeedwireInverter::processDcPowerResponse(const QByteArray &response) if (measurementId == 0x251e00 && measurmentNumber == 0x01) { quint32 powerMpp1; stream >> powerMpp1; - m_powerDcMpp1 = readValue(powerMpp1, 1000.0); + m_powerDcMpp1 = readValue(powerMpp1); qCDebug(dcSma()) << "Inverter: DC power MPP1" << m_powerDcMpp1 << "W"; readUntilEndOfMeasurement(stream); } else if (measurementId == 0x251e00 && measurmentNumber == 0x02) { quint32 powerMpp2; stream >> powerMpp2; - m_powerDcMpp2 = readValue(powerMpp2, 1000.0); + m_powerDcMpp2 = readValue(powerMpp2); qCDebug(dcSma()) << "Inverter: DC power MPP2" << m_powerDcMpp2 << "W"; readUntilEndOfMeasurement(stream); } diff --git a/sma/speedwireinverter.h b/sma/speedwireinverter.h index 518baf07..8750202b 100644 --- a/sma/speedwireinverter.h +++ b/sma/speedwireinverter.h @@ -184,7 +184,7 @@ private: void processInverterStatusResponse(const QByteArray &response); void readUntilEndOfMeasurement(QDataStream &stream); - double readValue(quint32 value, double divisor); + double readValue(quint32 value, double divisor = 1.0); void setReachable(bool reachable);