Add SoC threshold for battery current limit.

include/BatteryStats.h

@@ -159,7 +159,6 @@ class SBSBatteryStats : public BatteryStats {
 
         float _chargeVoltage;
         float _chargeCurrentLimitation;
-        float _dischargeCurrentLimitation;
         uint16_t _stateOfHealth;
         float _current;
         float _temperature;

include/Configuration.h

@@ -145,6 +145,8 @@ struct BATTERY_CONFIG_T {
     BatteryVoltageUnit MqttVoltageUnit;
     bool EnableDischargeCurrentLimit;
     float DischargeCurrentLimit;
+    float DischargeCurrentLimitBelowSoc;
+    float DischargeCurrentLimitBelowVoltage;
     bool UseBatteryReportedDischargeCurrentLimit;
     char MqttDischargeCurrentTopic[MQTT_MAX_TOPIC_STRLEN + 1];
     char MqttDischargeCurrentJsonPath[BATTERY_JSON_MAX_PATH_STRLEN + 1];

include/defaults.h

@@ -156,6 +156,8 @@
 #define BATTERY_JKBMS_POLLING_INTERVAL 5
 #define BATTERY_ENABLE_DISCHARGE_CURRENT_LIMIT false
 #define BATTERY_DISCHARGE_CURRENT_LIMIT 0.0
+#define BATTERY_DISCHARGE_CURRENT_LIMIT_BELOW_SOC 100.0
+#define BATTERY_DISCHARGE_CURRENT_LIMIT_BELOW_VOLTAGE 60.0
 #define BATTERY_USE_BATTERY_REPORTED_DISCHARGE_CURRENT_LIMIT false
 
 #define HUAWEI_ENABLED false

src/Battery.cpp

@@ -91,14 +91,26 @@ float BatteryClass::getDischargeCurrentLimit()
     if (!config.Battery.EnableDischargeCurrentLimit) { return FLT_MAX; }
 
     auto dischargeCurrentLimit = config.Battery.DischargeCurrentLimit;
-    auto dischargeCurrentValid = dischargeCurrentLimit > 0.0f;
-
+    auto dischargeCurrentLimitValid = dischargeCurrentLimit > 0.0f;
+    auto dischargeCurrentLimitBelowSoc = config.Battery.DischargeCurrentLimitBelowSoc;
+    auto dischargeCurrentLimitBelowVoltage = config.Battery.DischargeCurrentLimitBelowVoltage;
+    auto statsSoCValid = getStats()->getSoCAgeSeconds() <= 60 && !config.PowerLimiter.IgnoreSoc;
+    auto statsSoC = statsSoCValid ? getStats()->getSoC() : 100.0; // fail open so we use voltage instead
+    auto statsVoltageValid = getStats()->getVoltageAgeSeconds() <= 60;
+    auto statsVoltage = statsVoltageValid ? getStats()->getVoltage() : 0.0; // fail closed
     auto statsCurrentLimit = getStats()->getDischargeCurrentLimit();
     auto statsLimitValid = config.Battery.UseBatteryReportedDischargeCurrentLimit
         && statsCurrentLimit >= 0.0f
         && getStats()->getDischargeCurrentLimitAgeSeconds() <= 60;
 
-    if (statsLimitValid && dischargeCurrentValid) {
+
+    if (statsSoC > dischargeCurrentLimitBelowSoc && statsVoltage > dischargeCurrentLimitBelowVoltage) {
+        // Above SoC and Voltage thresholds, ignore custom limit.
+        // Battery-provided limit will still be applied.
+        dischargeCurrentLimitValid = false;
+    }
+
+    if (statsLimitValid && dischargeCurrentLimitValid) {
         // take the lowest limit
         return min(statsCurrentLimit, dischargeCurrentLimit);
     }
@@ -107,7 +119,7 @@ float BatteryClass::getDischargeCurrentLimit()
         return statsCurrentLimit;
     }
 
-    if (dischargeCurrentValid) {
+    if (dischargeCurrentLimitValid) {
         return dischargeCurrentLimit;
     }
 

src/BatteryStats.cpp

@@ -163,7 +163,6 @@ void SBSBatteryStats::getLiveViewData(JsonVariant& root) const
     // values go into the "Status" card of the web application
     addLiveViewValue(root, "chargeVoltage", _chargeVoltage, "V", 1);
     addLiveViewValue(root, "chargeCurrentLimitation", _chargeCurrentLimitation, "A", 1);
-    addLiveViewValue(root, "dischargeCurrentLimitation", _dischargeCurrentLimitation, "A", 1);
     addLiveViewValue(root, "stateOfHealth", _stateOfHealth, "%", 0);
     addLiveViewValue(root, "current", _current, "A", 1);
     addLiveViewValue(root, "temperature", _temperature, "°C", 1);
@@ -419,7 +418,6 @@ void SBSBatteryStats::mqttPublish() const
 
     MqttSettings.publish("battery/settings/chargeVoltage", String(_chargeVoltage));
     MqttSettings.publish("battery/settings/chargeCurrentLimitation", String(_chargeCurrentLimitation));
-    MqttSettings.publish("battery/settings/dischargeCurrentLimitation", String(_dischargeCurrentLimitation));
     MqttSettings.publish("battery/stateOfHealth", String(_stateOfHealth));
     MqttSettings.publish("battery/current", String(_current));
     MqttSettings.publish("battery/temperature", String(_temperature));

src/Configuration.cpp

@@ -88,6 +88,8 @@ void ConfigurationClass::serializeBatteryConfig(BatteryConfig const& source, Jso
     target["mqtt_voltage_unit"] = config.Battery.MqttVoltageUnit;
     target["enable_discharge_current_limit"] = config.Battery.EnableDischargeCurrentLimit;
     target["discharge_current_limit"] = config.Battery.DischargeCurrentLimit;
+    target["discharge_current_limit_below_soc"] = config.Battery.DischargeCurrentLimitBelowSoc;
+    target["discharge_current_limit_below_voltage"] = config.Battery.DischargeCurrentLimitBelowVoltage;
     target["use_battery_reported_discharge_current_limit"] = config.Battery.UseBatteryReportedDischargeCurrentLimit;
     target["mqtt_discharge_current_topic"] = config.Battery.MqttDischargeCurrentTopic;
     target["mqtt_discharge_current_json_path"] = config.Battery.MqttDischargeCurrentJsonPath;
@@ -383,6 +385,8 @@ void ConfigurationClass::deserializeBatteryConfig(JsonObject const& source, Batt
     target.MqttVoltageUnit = source["mqtt_voltage_unit"] | BatteryVoltageUnit::Volts;
     target.EnableDischargeCurrentLimit = source["enable_discharge_current_limit"] | BATTERY_ENABLE_DISCHARGE_CURRENT_LIMIT;
     target.DischargeCurrentLimit = source["discharge_current_limit"] | BATTERY_DISCHARGE_CURRENT_LIMIT;
+    target.DischargeCurrentLimitBelowSoc = source["discharge_current_limit_below_soc"] | BATTERY_DISCHARGE_CURRENT_LIMIT_BELOW_SOC;
+    target.DischargeCurrentLimitBelowVoltage = source["discharge_current_limit_below_voltage"] | BATTERY_DISCHARGE_CURRENT_LIMIT_BELOW_VOLTAGE;
     target.UseBatteryReportedDischargeCurrentLimit = source["use_battery_reported_discharge_current_limit"] | BATTERY_USE_BATTERY_REPORTED_DISCHARGE_CURRENT_LIMIT;
     strlcpy(target.MqttDischargeCurrentTopic, source["mqtt_discharge_current_topic"] | "", sizeof(config.Battery.MqttDischargeCurrentTopic));
     strlcpy(target.MqttDischargeCurrentJsonPath, source["mqtt_discharge_current_json_path"] | "", sizeof(config.Battery.MqttDischargeCurrentJsonPath));

src/SBSCanReceiver.cpp

@@ -74,10 +74,10 @@ void SBSCanReceiver::onMessage(twai_message_t rx_message)
 
         case 0x640: {
             _stats->_chargeCurrentLimitation = (this->readSignedInt24(rx_message.data + 3) * 0.001);
-            _stats->_dischargeCurrentLimitation = (this->readSignedInt24(rx_message.data)) * 0.001;
+            _stats->setDischargeCurrentLimit(this->readSignedInt24(rx_message.data) * 0.001, millis());
 
             if (_verboseLogging) {
-                MessageOutput.printf("[SBS Unipower] 1600 Currents  %f, %f \r\n", _stats->_chargeCurrentLimitation, _stats->_dischargeCurrentLimitation);
+                MessageOutput.printf("[SBS Unipower] 1600 Currents  %f, %f \r\n", _stats->_chargeCurrentLimitation, _stats->getDischargeCurrentLimit());
             }
             break;
         }
@@ -144,7 +144,7 @@ void SBSCanReceiver::dummyData()
     _stats->setSoC(42, 0/*precision*/, millis());
     _stats->_chargeVoltage = dummyFloat(50);
     _stats->_chargeCurrentLimitation = dummyFloat(33);
-    _stats->_dischargeCurrentLimitation = dummyFloat(12);
+    _stats->setDischargeCurrentLimit(dummyFloat(12), millis());
     _stats->_stateOfHealth = 99;
     _stats->setVoltage(48.67, millis());
     _stats->_current = dummyFloat(-1);

webapp/src/locales/de.json

@@ -724,6 +724,10 @@
         "DischargeCurrentLimitConfiguration": "Einstellungen Entladestromlimit",
         "LimitDischargeCurrent": "Entladestrom limitieren",
         "DischargeCurrentLimit": "max. Entladestrom",
+        "DischargeCurrentLimitBelowSoc": "Limitieren unter SoC",
+        "DischargeCurrentLimitBelowSocInfo": "Das Entladestromlimit wird nur unter dieser SoC-Schwelle angewendet (wird nicht verwendet, falls 'Batterie SoC ignorieren' in den DPL-Einstellungen aktiviert ist).",
+        "DischargeCurrentLimitBelowVoltage": "Limitieren unter Spannung",
+        "DischargeCurrentLimitBelowVoltageInfo": "Das Entladestromlimit wird nur unter dieser Spannungs-Schwelle angewendet (wenn 'Batterie SoC ignorieren' in den DPL-Einstellungen aktiviert ist oder SoC nicht verfügbar ist).",
         "UseBatteryReportedDischargeCurrentLimit": "Von der Batterie übermitteltes Limit verwenden",
         "BatteryReportedDischargeCurrentLimitInfo": "<b>Hinweis:</b> Das niedrigste Limit wird angewendet, wobei das von der Batterie übermittelte Entladestromlimit nur verwendet wird, wenn in der letzten Minute ein Update eingegangen ist; andernfalls dient das zuvor festgelegte Limit als Fallback.",
         "MqttDischargeCurrentTopic": "Topic für Entladestromlimit",

webapp/src/locales/en.json

@@ -727,6 +727,10 @@
         "DischargeCurrentLimitConfiguration": "Discharge Current Limit Settings",
         "LimitDischargeCurrent": "Limit Discharge Current",
         "DischargeCurrentLimit": "max. Discharge Current",
+        "DischargeCurrentLimitBelowSoc": "Apply limit below SoC",
+        "DischargeCurrentLimitBelowSocInfo": "The discharge current limit is only applied below this SoC (not used if 'Ignore Battery SoC' is enabled in the DPL settings).",
+        "DischargeCurrentLimitBelowVoltage": "Apply limit below voltage",
+        "DischargeCurrentLimitBelowVoltageInfo": "The discharge current limit is only applied below this voltage (used if 'Ignore Battery SoC' is enabled in the DPL settings or when SoC is unavailable).",
         "UseBatteryReportedDischargeCurrentLimit": "Use Battery-Reported limit",
         "BatteryReportedDischargeCurrentLimitInfo": "<b>Hint:</b> The lowest limit will be applied, with the battery-reported discharge current limit used only if an update was received in the last minute; otherwise, the previously specified limit will act as a fallback.",
         "MqttDischargeCurrentTopic": "Discharge Current Limit Value Topic",

webapp/src/types/BatteryConfig.ts

@@ -11,6 +11,8 @@ export interface BatteryConfig {
     mqtt_voltage_unit: number;
     enable_discharge_current_limit: boolean;
     discharge_current_limit: number;
+    discharge_current_limit_below_soc: number;
+    discharge_current_limit_below_voltage: number;
     use_battery_reported_discharge_current_limit: boolean;
     mqtt_discharge_current_topic: string;
     mqtt_discharge_current_json_path: string;