Merge branch 'development' into feature/zendure_solarflow

hoylabs · Oct 18, 2024 · a2e71cb · a2e71cb
2 parents 80fa03f + 844d920
commit a2e71cb
Show file tree

Hide file tree

Showing 13 changed files with 263 additions and 27 deletions.
diff --git a/include/BatteryCanReceiver.h b/include/BatteryCanReceiver.h
@@ -19,7 +19,7 @@ class BatteryCanReceiver : public BatteryProvider {
     int16_t readSignedInt16(uint8_t *data);
     uint32_t readUnsignedInt32(uint8_t *data);
     int32_t readSignedInt24(uint8_t *data);
-    float scaleValue(int16_t value, float factor);
+    float scaleValue(int32_t value, float factor);
     bool getBit(uint8_t value, uint8_t bit);
 
     bool _verboseLogging = true;

diff --git a/include/BatteryStats.h b/include/BatteryStats.h
@@ -184,6 +184,7 @@ class PytesBatteryStats : public BatteryStats {
     public:
         void getLiveViewData(JsonVariant& root) const final;
         void mqttPublish() const final;
+        bool getImmediateChargingRequest() const { return _chargeImmediately; };
         float getChargeCurrentLimitation() const { return _chargeCurrentLimit; };
 
     private:
@@ -202,6 +203,8 @@ class PytesBatteryStats : public BatteryStats {
         float _dischargeVoltageLimit;
 
         uint16_t _stateOfHealth;
+        int _chargeCycles = -1;
+        int _balance = -1;
 
         float _temperature;
 
@@ -221,8 +224,9 @@ class PytesBatteryStats : public BatteryStats {
         uint8_t _moduleCountBlockingCharge;
         uint8_t _moduleCountBlockingDischarge;
 
-        uint16_t _totalCapacity;
-        uint16_t _availableCapacity;
+        float _totalCapacity;
+        float _availableCapacity;
+        uint8_t _capacityPrecision = 0; // decimal places
 
         float _chargedEnergy = -1;
         float _dischargedEnergy = -1;
@@ -248,6 +252,8 @@ class PytesBatteryStats : public BatteryStats {
         bool _warningHighTemperatureCharge;
         bool _warningInternalFailure;
         bool _warningCellImbalance;
+
+        bool _chargeImmediately;
 };
 
 class JkBmsBatteryStats : public BatteryStats {

diff --git a/include/defaults.h b/include/defaults.h
@@ -155,7 +155,7 @@
 #define BATTERY_JKBMS_INTERFACE 0
 #define BATTERY_JKBMS_POLLING_INTERVAL 5
 #define BATTERY_ENABLE_DISCHARGE_CURRENT_LIMIT false
-#define BATTERY_DISCHARGE_CURRENT_LIMIT 0
+#define BATTERY_DISCHARGE_CURRENT_LIMIT 0.0
 #define BATTERY_USE_BATTERY_REPORTED_DISCHARGE_CURRENT_LIMIT false
 #define BATTERY_ZENDURE_POLLING_INTERVAL 15
 #define BATTERY_ZENDURE_DEVICE 0

diff --git a/lib/VeDirectFrameHandler/VeDirectMpptController.cpp b/lib/VeDirectFrameHandler/VeDirectMpptController.cpp
@@ -184,7 +184,7 @@ bool VeDirectMpptController::hexDataHandler(VeDirectHexData const &data) {
 			}
 
 			_tmpFrame.SmartBatterySenseTemperatureMilliCelsius =
-				{ millis(), static_cast<int32_t>(data.value) * 10 - 272150 };
+				{ millis(), static_cast<int32_t>(data.value) * 10 - 273150 };
 
 			if (_verboseLogging) {
 				_msgOut->printf("%s Hex Data: Smart Battery Sense Temperature (0x%04X): %.2f°C\r\n",

diff --git a/src/Battery.cpp b/src/Battery.cpp
@@ -112,7 +112,7 @@ float BatteryClass::getDischargeCurrentLimit()
     }
 
     if (dischargeCurrentValid) {
-        return dischargeCurrentValid;
+        return dischargeCurrentLimit;
     }
 
     return FLT_MAX;

diff --git a/src/BatteryCanReceiver.cpp b/src/BatteryCanReceiver.cpp
@@ -178,7 +178,7 @@ uint32_t BatteryCanReceiver::readUnsignedInt32(uint8_t *data)
     return (data[3] << 24) | (data[2] << 16) | (data[1] << 8) | data[0];
 }
 
-float BatteryCanReceiver::scaleValue(int16_t value, float factor)
+float BatteryCanReceiver::scaleValue(int32_t value, float factor)
 {
     return value * factor;
 }

diff --git a/src/BatteryStats.cpp b/src/BatteryStats.cpp
@@ -190,10 +190,13 @@ void PytesBatteryStats::getLiveViewData(JsonVariant& root) const
     addLiveViewValue(root, "chargeCurrentLimitation", _chargeCurrentLimit, "A", 1);
     addLiveViewValue(root, "dischargeVoltageLimitation", _dischargeVoltageLimit, "V", 1);
     addLiveViewValue(root, "stateOfHealth", _stateOfHealth, "%", 0);
+    if (_chargeCycles != -1) {
+        addLiveViewValue(root, "chargeCycles", _chargeCycles, "", 0);
+    }
     addLiveViewValue(root, "temperature", _temperature, "°C", 1);
 
-    addLiveViewValue(root, "capacity", _totalCapacity, "Ah", 0);
-    addLiveViewValue(root, "availableCapacity", _availableCapacity, "Ah", 0);
+    addLiveViewValue(root, "capacity", _totalCapacity, "Ah", _capacityPrecision);
+    addLiveViewValue(root, "availableCapacity", _availableCapacity, "Ah", _capacityPrecision);
 
     if (_chargedEnergy != -1) {
         addLiveViewValue(root, "chargedEnergy", _chargedEnergy, "kWh", 1);
@@ -202,6 +205,11 @@ void PytesBatteryStats::getLiveViewData(JsonVariant& root) const
     if (_dischargedEnergy != -1) {
         addLiveViewValue(root, "dischargedEnergy", _dischargedEnergy, "kWh", 1);
     }
+    addLiveViewTextValue(root, "chargeImmediately", (_chargeImmediately?"yes":"no"));
+
+    if (_balance != -1) {
+        addLiveViewTextValue(root, "balancingActive", (_balance?"yes":"no"));
+    }
 
     addLiveViewInSection(root, "cells", "cellMinVoltage", static_cast<float>(_cellMinMilliVolt)/1000, "V", 3);
     addLiveViewInSection(root, "cells", "cellMaxVoltage", static_cast<float>(_cellMaxMilliVolt)/1000, "V", 3);
@@ -434,6 +442,12 @@ void PytesBatteryStats::mqttPublish() const
     MqttSettings.publish("battery/settings/dischargeVoltageLimitation", String(_dischargeVoltageLimit));
 
     MqttSettings.publish("battery/stateOfHealth", String(_stateOfHealth));
+    if (_chargeCycles != -1) {
+        MqttSettings.publish("battery/chargeCycles", String(_chargeCycles));
+    }
+    if (_balance != -1) {
+        MqttSettings.publish("battery/balancingActive", String(_balance ? 1 : 0));
+    }
     MqttSettings.publish("battery/temperature", String(_temperature));
 
     if (_chargedEnergy != -1) {
@@ -483,6 +497,8 @@ void PytesBatteryStats::mqttPublish() const
     MqttSettings.publish("battery/warning/highTemperatureCharge", String(_warningHighTemperatureCharge));
     MqttSettings.publish("battery/warning/bmsInternal", String(_warningInternalFailure));
     MqttSettings.publish("battery/warning/cellImbalance", String(_warningCellImbalance));
+
+    MqttSettings.publish("battery/charging/chargeImmediately", String(_chargeImmediately));
 }
 
 void JkBmsBatteryStats::mqttPublish() const

diff --git a/src/MqttHandleBatteryHass.cpp b/src/MqttHandleBatteryHass.cpp
@@ -138,6 +138,7 @@ void MqttHandleBatteryHassClass::loop()
             publishSensor("Current", "mdi:current-dc", "current", "current", "measurement", "A");
             publishSensor("State of Health (SOH)", "mdi:heart-plus", "stateOfHealth", NULL, "measurement", "%");
             publishSensor("Temperature", "mdi:thermometer", "temperature", "temperature", "measurement", "°C");
+            publishSensor("Charge Cycles", "mdi:counter", "chargeCycles");
 
             publishSensor("Charged Energy", NULL, "chargedEnergy", "energy", "total_increasing", "kWh");
             publishSensor("Discharged Energy", NULL, "dischargedEnergy", "energy", "total_increasing", "kWh");
@@ -182,6 +183,9 @@ void MqttHandleBatteryHassClass::loop()
             publishBinarySensor("Warning Temperature high (charge)", "mdi:thermometer-high", "warning/highTemperatureCharge", "1", "0");
             publishBinarySensor("Warning BMS internal", "mdi:alert-outline", "warning/bmsInternal", "1", "0");
             publishBinarySensor("Warning Cell Imbalance", "mdi:alert-outline", "warning/cellImbalance", "1", "0");
+
+            publishBinarySensor("Balancing Active", "mdi:scale-balance", "balancingActive", "1", "0");
+            publishBinarySensor("Charge immediately", "mdi:alert", "charging/chargeImmediately", "1", "0");
             break;
 
         case 5: // SBS Unipower