Yield/User and Yiels/System now updated in real time instead of once each day

Author: osaether

software/src/dbus_tsmppt_bridge.cpp

@@ -38,8 +38,8 @@ DBusTsmpptBridge::DBusTsmpptBridge(Tsmppt *tsmppt, QObject *parent):
     produce(mTsmppt, "powerMaxDaily", "/History/Daily/0/MaxPower", "W", 0);
     produce(mTsmppt, "arrayVoltageMaxDaily", "/History/Daily/0/MaxPvVoltage", "V", 2);
     produce(mTsmppt, "wattHoursDaily", "/History/Daily/0/Yield", "kWh", 2);
-    produce(mTsmppt, "wattHoursTotalResettable", "/Yield/User", "kWh", 0);
-    produce(mTsmppt, "wattHoursTotal", "/Yield/System", "kWh", 0);
+    produce(mTsmppt, "yieldUser", "/Yield/User", "kWh", 0);
+    produce(mTsmppt, "yieldSystem", "/Yield/System", "kWh", 0);
     produce(mTsmppt, "timeInAbsorption", "/History/Daily/0/TimeInAbsorption");
     // TSMPPT does not give time in bulk:
     // produce(mTsmppt, "timeInBulk", "/History/Daily/0/TimeInBulk");

software/src/tsmppt.cpp

@@ -30,7 +30,7 @@ const int REG_ESERIAL       = 57536;
 const int REG_EMODEL        = 57548;
 
 Tsmppt::Tsmppt(const QString &IPAddress, const int port, int interval, int slave, QObject *parent):
-QObject(parent), mInitialized(false), mTimer(new QTimer(this))
+QObject(parent), mInitialized(false), mTimer(new QTimer(this)), yield_user(0), yield_system(0)
 {
     QLOG_DEBUG() << "Tsmppt::Tsmppt(" << IPAddress << ", " << port << ", " << interval << ", " << slave << ")";
     mCtx = modbus_new_tcp_pi(IPAddress.toStdString().c_str(), QString::number(port).toStdString().c_str());
@@ -198,10 +198,12 @@ void Tsmppt::updateValues()
         // Whc total:
         temp = (double)reg[REG_KWH_TOTAL_RES-REG_FIRST_DYN];
         setWattHoursTotalResettable(temp);
+        setYieldUser(m_whc+temp);
 
         // Whc total:
         temp = (double)reg[REG_KWH_TOTAL-REG_FIRST_DYN];
         setWattHoursTotal(temp);
+        setYieldSystem(m_whc+temp);
 
         // Pmax daily:
         temp = (double)reg[REG_POUT_MAX_DAILY-REG_FIRST_DYN] * m_i_pu * m_v_pu / 131072.0;
@@ -443,6 +445,32 @@ int Tsmppt::timeInFloat() const
     return m_t_float;
 }
 
+void Tsmppt::setYieldUser(double v)
+{
+    if (yield_user == v)
+        return;
+    yield_user = v;
+    emit yieldUserChanged();
+}
+
+double Tsmppt::yieldUser() const
+{
+    return yield_user;
+}
+
+void Tsmppt::setYieldSystem(double v)
+{
+    if (yield_system == v)
+        return;
+    yield_system = v;
+    emit yieldSystemChanged();
+}
+
+double Tsmppt::yieldSystem() const
+{
+    return yield_system;
+}
+
 void Tsmppt::setTimeInFloat(int v)
 {
     if (m_t_float == v)

software/src/tsmppt.h

@@ -26,6 +26,8 @@ class Tsmppt : public QObject
     Q_PROPERTY(int chargeState READ chargeState WRITE setChargeState NOTIFY chargeStateChanged)
     Q_PROPERTY(int timeInAbsorption READ timeInAbsorption WRITE setTimeInAbsorption NOTIFY timeInAbsorptionChanged)
     Q_PROPERTY(int timeInFloat READ timeInFloat WRITE setTimeInFloat NOTIFY timeInFloatChanged)
+    Q_PROPERTY(double yieldUser READ yieldUser WRITE setYieldUser NOTIFY yieldUserChanged)
+    Q_PROPERTY(double yieldSystem READ yieldSystem WRITE setYieldSystem NOTIFY yieldSystemChanged)
 
 public:
     Tsmppt(const QString &IPAddress, const int port = 502, int interval = 5000, int slave = 1, QObject *parent = 0);
@@ -79,6 +81,12 @@ class Tsmppt : public QObject
     int timeInFloat() const;
     void setTimeInFloat(int v);
 
+    double yieldUser() const;
+    void setYieldUser(double v);
+
+    double yieldSystem() const;
+    void setYieldSystem(double v);
+
     QString firmwareVersion() const;
     QString hardwareVersion() const;
     uint64_t serialNumber() const;
@@ -105,6 +113,8 @@ class Tsmppt : public QObject
     void connectionLost();
     void timeInAbsorptionChanged();
     void timeInFloatChanged();
+    void yieldUserChanged();
+    void yieldSystemChanged();
 
 private slots:
     void onTimeout();
@@ -133,6 +143,9 @@ private slots:
     int m_cs;               // Charge state
     int m_t_abs;            // Time in absorption
     int m_t_float;          // Time in float
+    double yield_user;      // Watt hours, total since last reset
+    double yield_system;    // Watt hours, total
+
     // Static values (read once):
     double m_v_pu;          // Voltage scaling
     double m_i_pu;          // Current scaling