Implemented time in bulk counter

Author: osaether

software/src/dbus_tsmppt_bridge.cpp

@@ -41,11 +41,8 @@ DBusTsmpptBridge::DBusTsmpptBridge(Tsmppt *tsmppt, QObject *parent):
     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");
+    produce(mTsmppt, "timeInBulk", "/History/Daily/0/TimeInBulk");
     produce(mTsmppt, "timeInFloat", "/History/Daily/0/TimeInFloat");
-
-    //registerService();
 }
 
 DBusTsmpptBridge::~DBusTsmpptBridge()

software/src/tsmppt.cpp

@@ -29,8 +29,12 @@ const int REG_EHW_VERSION   = 57549;
 const int REG_ESERIAL       = 57536;
 const int REG_EMODEL        = 57548;
 
+const int CS_NIGHT          = 3;
+const int CS_BULK           = 5;
+
+
 Tsmppt::Tsmppt(const QString &IPAddress, const int port, int interval, int slave, QObject *parent):
-QObject(parent), mInitialized(false), mTimer(new QTimer(this)), yield_user(0), yield_system(0)
+QObject(parent), mInitialized(false), mTimer(new QTimer(this)), m_interval(interval), m_t_bulk(0), m_t_bulk_ms(0), 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());
@@ -49,7 +53,7 @@ QObject(parent), mInitialized(false), mTimer(new QTimer(this)), yield_user(0), y
     modbus_set_byte_timeout(mCtx, &to);
 #endif
     modbus_set_slave(mCtx, slave);
-    mTimer->setInterval(interval);
+    mTimer->setInterval(m_interval);
     mTimer->start();
     connect(mTimer, SIGNAL(timeout()), this, SLOT(onTimeout()));
 }
@@ -230,6 +234,11 @@ void Tsmppt::updateValues()
         // Charge state:
         setChargeState(reg[REG_CHARGE_STATE-REG_FIRST_DYN]);
 
+        if (m_cs == CS_BULK)        
+            m_t_bulk_ms += m_interval;
+        else if (m_cs == CS_NIGHT)
+            m_t_bulk_ms = 0;
+        setTimeInBulk((int)(m_t_bulk_ms/(1000*60)));
         setTimeInAbsorption(reg[REG_T_ABS-REG_FIRST_DYN]/60);
         setTimeInFloat(reg[REG_T_FLOAT-REG_FIRST_DYN]/60);
     }
@@ -429,7 +438,7 @@ int Tsmppt::chargeState() const
     // 2 DISCONNECT         0 OFF
     // 3 NIGHT              0 OFF
     // 4 FAULT              2 FAULT
-    // 5 MNPPT              3 BULK
+    // 5 MPPT               3 BULK
     // 6 ABSORPTION         4 ABSORPTION
     // 7 FLOAT              5 FLOAT
     // 8 EQUALIZE           7 EQUALIZE
@@ -464,6 +473,20 @@ int Tsmppt::timeInFloat() const
     return m_t_float;
 }
 
+
+void Tsmppt::setTimeInBulk(int v)
+{
+    if (m_t_bulk == v)
+        return;
+    m_t_bulk = v;
+    emit timeInBulkChanged();
+}
+
+int Tsmppt::timeInBulk() const
+{
+    return m_t_bulk;
+}
+
 void Tsmppt::setYieldUser(double v)
 {
     if (yield_user == v)

software/src/tsmppt.h

@@ -26,6 +26,7 @@ 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(int timeInBulk READ timeInBulk WRITE setTimeInBulk NOTIFY timeInBulkChanged)
     Q_PROPERTY(double yieldUser READ yieldUser WRITE setYieldUser NOTIFY yieldUserChanged)
     Q_PROPERTY(double yieldSystem READ yieldSystem WRITE setYieldSystem NOTIFY yieldSystemChanged)
 
@@ -81,6 +82,9 @@ class Tsmppt : public QObject
     int timeInFloat() const;
     void setTimeInFloat(int v);
 
+    int timeInBulk() const;
+    void setTimeInBulk(int v);
+
     double yieldUser() const;
     void setYieldUser(double v);
 
@@ -113,6 +117,7 @@ class Tsmppt : public QObject
     void connectionLost();
     void timeInAbsorptionChanged();
     void timeInFloatChanged();
+    void timeInBulkChanged();
     void yieldUserChanged();
     void yieldSystemChanged();
 
@@ -126,6 +131,8 @@ private slots:
     QTimer *mTimer;
     modbus_t *mCtx;
     uint16_t *mModbusRegs;
+    int m_interval;
+
     // Dynamic values:
     double m_v_bat;         // Battery voltage
     double m_v_bat_max;     // Max battery voltage, daily
@@ -143,6 +150,8 @@ private slots:
     int m_cs;               // Charge state
     int m_t_abs;            // Time in absorption
     int m_t_float;          // Time in float
+    int m_t_bulk;           // Time in bulk
+    uint32_t m_t_bulk_ms;   // Time in bulk (ms)
     double yield_user;      // Watt hours, total since last reset
     double yield_system;    // Watt hours, total