implemented charge through for battery housekeeping

hoylabs · Oct 9, 2024 · 7b0bac3 · 7b0bac3
1 parent 646efd3
commit 7b0bac3
Show file tree

Hide file tree

Showing 15 changed files with 600 additions and 216 deletions.
diff --git a/include/BatteryStats.h b/include/BatteryStats.h
@@ -8,6 +8,7 @@
 #include "JkBmsDataPoints.h"
 #include "VeDirectShuntController.h"
 #include <cfloat>
+#include <utility>
 
 // mandatory interface for all kinds of batteries
 class BatteryStats {
@@ -381,18 +382,20 @@ class ZendureBatteryStats : public BatteryStats {
 
             inline uint8_t getCellCount() const { return _cellCount; }
             inline uint16_t getCapacity() const { return _capacity; }
+            inline uint16_t getAvailableCapacity() const { return _capacity_avail; };
             inline String getName() const { return _name; }
 
             static std::shared_ptr<PackStats> fromSerial(String serial){
                 if (serial.length() == 15) {
                     if (serial.startsWith("AO4H")){
-                        // return std::make_shared<PackStats>(AB1000(serial));
                         return std::make_shared<PackStats>(PackStats(serial, "AB1000", 960));
                     }
                     if (serial.startsWith("CO4H")){
-                        // return std::make_shared<PackStats>(AB2000(serial));
                         return std::make_shared<PackStats>(PackStats(serial, "AB2000", 1920));
                     }
+                    if (serial.startsWith("R04Y")){
+                        return std::make_shared<PackStats>(PackStats(serial, "AIO2400", 2400));
+                    }
                     return std::make_shared<PackStats>(PackStats(serial));
                 }
                 return nullptr;
@@ -406,20 +409,23 @@ class ZendureBatteryStats : public BatteryStats {
             void setFwVersion(String&& version) { _fwversion = std::move(version); }
 
         private:
-            String _serial = "";
-            String _name = "UNKOWN";
+            String _serial = String();
+            String _name = String("UNKOWN");
             uint16_t _capacity = 0;
             uint8_t _cellCount = 15;
 
-            String _fwversion = "";
-            String _hwversion = "";
+            String _fwversion = String();
+            String _hwversion = String();
 
             uint16_t _cell_voltage_min = 0;
             uint16_t _cell_voltage_max = 0;
             uint16_t _cell_voltage_spread = 0;
             uint16_t _cell_voltage_avg = 0;
             int16_t _cell_temperature_max = 0;
 
+            float _state_of_health = 1;
+            uint16_t _capacity_avail = 0;
+
             float _voltage_total = 0.0;
             float _current = 0.0;
             int16_t _power = 0;
@@ -435,14 +441,16 @@ class ZendureBatteryStats : public BatteryStats {
         void mqttPublish() const;
         void getLiveViewData(JsonVariant& root) const;
 
+        std::map<size_t, std::shared_ptr<PackStats>> getPackDataList() const { return _packData; }
+
         bool supportsAlarmsAndWarnings() const final { return false; }
 
     protected:
         std::optional<std::shared_ptr<ZendureBatteryStats::PackStats> > getPackData(size_t index) const;
         std::optional<std::shared_ptr<ZendureBatteryStats::PackStats> > addPackData(size_t index, String serial);
 
         uint16_t getCapacity() const { return _capacity; };
-        uint16_t getAvailableCapacity() const { return getCapacity() * (static_cast<float>(_soc_max - _soc_min) / 100.0); };
+        uint16_t getUseableCapacity() const { return _capacity_avail * (static_cast<float>(_soc_max - _soc_min) / 100.0); };
 
     private:
         void setHwVersion(String&& version) {
@@ -467,7 +475,7 @@ class ZendureBatteryStats : public BatteryStats {
             _device = std::move(device);
         }
 
-        String _device = "Unkown";
+        String _device = String("Unkown");
 
         std::map<size_t, std::shared_ptr<PackStats>> _packData = std::map<size_t, std::shared_ptr<PackStats> >();
 
@@ -486,6 +494,7 @@ class ZendureBatteryStats : public BatteryStats {
 
         float _efficiency = 0.0;
         uint16_t _capacity = 0;
+        uint16_t _capacity_avail = 0;
 
         uint16_t _charge_power = 0;
         uint16_t _discharge_power = 0;
@@ -505,4 +514,9 @@ class ZendureBatteryStats : public BatteryStats {
         bool _heat_state = false;
         bool _auto_shutdown = false;
         bool _buzzer = false;
+
+        std::optional<uint64_t> _last_full_timestamp = std::nullopt;
+        std::optional<uint32_t> _last_full_charge_hours = std::nullopt;
+        std::optional<uint64_t> _last_empty_timestamp = std::nullopt;
+        std::optional<bool>  _charge_through_state = std::nullopt;
 };
diff --git a/include/Configuration.h b/include/Configuration.h
@@ -167,6 +167,8 @@ struct BATTERY_CONFIG_T {
     int16_t ZendureSunsetOffset;
     uint16_t ZendureOutputLimitDay;
     uint16_t ZendureOutputLimitNight;
+    bool ZendureChargeThroughEnable;
+    uint16_t ZendureChargeThroughInterval;
 };
 using BatteryConfig = struct BATTERY_CONFIG_T;
 

diff --git a/include/Utils.h b/include/Utils.h
@@ -23,4 +23,6 @@ class Utils {
 
     template<typename T>
     static std::optional<T> getJsonElement(JsonObjectConst root, char const* key, size_t nesting = 0);
+
+    static bool getEpoch(time_t* epoch, uint32_t ms);
 };