From 31314847d913c168e9dee6d721466cd3a2e99ff5 Mon Sep 17 00:00:00 2001 From: Sleeper85 Date: Tue, 11 Aug 2026 00:23:36 +0200 Subject: [PATCH] YamBMS core 1.8.0 - CVL, CCL and DCL code improvements --- ...og_YamBMS_1.8.0_Cut-Off_charging_logic.md} | 2 +- packages/base/device_base_esphome.yaml | 6 +- packages/bms/bms_combine.yaml | 4 +- packages/yambms/yambms.yaml | 5 +- packages/yambms/yambms_core.yaml | 95 +++++++++++++------ 5 files changed, 77 insertions(+), 35 deletions(-) rename documents/README/{Release_note_YamBMS_1.7.1_Cut-Off_charging_logic.md => changelog/Changelog_YamBMS_1.8.0_Cut-Off_charging_logic.md} (99%) diff --git a/documents/README/Release_note_YamBMS_1.7.1_Cut-Off_charging_logic.md b/documents/README/changelog/Changelog_YamBMS_1.8.0_Cut-Off_charging_logic.md similarity index 99% rename from documents/README/Release_note_YamBMS_1.7.1_Cut-Off_charging_logic.md rename to documents/README/changelog/Changelog_YamBMS_1.8.0_Cut-Off_charging_logic.md index da673b2..e9a4294 100644 --- a/documents/README/Release_note_YamBMS_1.7.1_Cut-Off_charging_logic.md +++ b/documents/README/changelog/Changelog_YamBMS_1.8.0_Cut-Off_charging_logic.md @@ -1,4 +1,4 @@ -# YamBMS - Release note about new YamBMS 1.7.1 Cut-Off charging logic +# YamBMS - Changelog about new YamBMS 1.8.0 Cut-Off charging logic [![Badge License: GPLv3](https://img.shields.io/badge/License-GPLv3-brightgreen.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Badge Version](https://img.shields.io/github/v/release/Sleeper85/esphome-yambms?include_prereleases&color=yellow&logo=DocuSign&logoColor=white)](https://github.com/Sleeper85/esphome-yambms/releases/latest) diff --git a/packages/base/device_base_esphome.yaml b/packages/base/device_base_esphome.yaml index 82c3b91..3600688 100644 --- a/packages/base/device_base_esphome.yaml +++ b/packages/base/device_base_esphome.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.07.31 -# Version : 1.7.1 +# Updated : 2026.08.11 +# Version : 1.8.0 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -18,7 +18,7 @@ # along with this program. If not, see . substitutions: - yambms_version: "1.7.1" + yambms_version: "1.8.0" esphome: name: ${hostname} diff --git a/packages/bms/bms_combine.yaml b/packages/bms/bms_combine.yaml index c8ea756..eb234c2 100644 --- a/packages/bms/bms_combine.yaml +++ b/packages/bms/bms_combine.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.07.08 -# Version : 1.7.1 +# Updated : 2026.08.11 +# Version : 1.8.0 # GitHub : https://github.com/Sleeper85/esphome-yambms # This YAML is free software: you can redistribute it and/or diff --git a/packages/yambms/yambms.yaml b/packages/yambms/yambms.yaml index bd9a2c3..92d9d70 100644 --- a/packages/yambms/yambms.yaml +++ b/packages/yambms/yambms.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.03.23 -# Version : 1.1.5 +# Updated : 2026.08.11 +# Version : 1.1.6 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -28,5 +28,6 @@ packages: yambms_auto_5: !include yambms_auto_eoc.yaml yambms_auto_6: !include yambms_auto_temp_ccl_dcl.yaml yambms_auto_7: !include yambms_auto_soc_limit.yaml + yambms_auto_8: !include yambms_auto_ccl_current_taper.yaml # Update service yambms_service: !include yambms_service.yaml diff --git a/packages/yambms/yambms_core.yaml b/packages/yambms/yambms_core.yaml index 260398c..8d34197 100644 --- a/packages/yambms/yambms_core.yaml +++ b/packages/yambms/yambms_core.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.08.09 -# Version : 1.7.1 +# Updated : 2026.08.11 +# Version : 1.8.0 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -18,7 +18,7 @@ # along with this program. If not, see . substitutions: - yambms_version: "1.7.1" + yambms_version: "1.8.0" # Cut-Off Charging Logic yambms_cutoff_crate: '0.05' # (C-Rate) matches the standard charge termination of most LFP, Li-ion and LTO datasheets and is the right value for the vast majority of installations. Check your cell datasheet before changing it. yambms_eoc_min_soc: '95' # (%) minimum SoC (Max 98%) required to allow Cut-Off/EOC @@ -274,6 +274,10 @@ globals: type: float restore_value: no initial_value: '0.0' + - id: yambms${yambms_id}_var_auto_ccl_current_taper + type: float + restore_value: no + initial_value: '0.0' - id: yambms${yambms_id}_var_auto_dcl type: float restore_value: no @@ -286,14 +290,6 @@ globals: type: float restore_value: no initial_value: '0.0' - - id: yambms${yambms_id}_var_auto_custom_ccl - type: float - restore_value: no - initial_value: '0.0' - - id: yambms${yambms_id}_var_auto_custom_dcl - type: float - restore_value: no - initial_value: '0.0' - id: yambms${yambms_id}_var_auto_eoc type: float restore_value: no @@ -306,10 +302,23 @@ globals: type: float restore_value: no initial_value: '0.0' + - id: yambms${yambms_id}_var_auto_custom_cvl + type: float + restore_value: no + initial_value: '0.0' + - id: yambms${yambms_id}_var_auto_custom_ccl + type: float + restore_value: no + initial_value: '0.0' + - id: yambms${yambms_id}_var_auto_custom_dcl + type: float + restore_value: no + initial_value: '0.0' - id: yambms${yambms_id}_var_eoc type: bool restore_value: no initial_value: 'false' + - id: yambms${yambms_id}_var_eoc_timestamp type: time_t restore_value: true @@ -1003,15 +1012,27 @@ interval: // +-----------------------------------------------+ float requested_charge_voltage; if (id(yambms${yambms_id}_bms_combined).state == 0) // no BMS combined + { requested_charge_voltage = 0; - // Bulk - else if (charging_instruction == "Bulk") - requested_charge_voltage = (id(yambms${yambms_id}_bulk_voltage).state + id(yambms${yambms_id}_charger_offset_v).state + id(yambms${yambms_id}_var_auto_cvl)); - // Float - else if (charging_instruction == "Float") - requested_charge_voltage = (id(yambms${yambms_id}_float_voltage).state + id(yambms${yambms_id}_charger_offset_v).state) + id(yambms${yambms_id}_var_auto_float); - // Stop Charging - else requested_charge_voltage = (id(yambms${yambms_id}_rebulk_voltage).state + id(yambms${yambms_id}_charger_offset_v).state); + } + else + { + // Bulk + if (charging_instruction == "Bulk") + requested_charge_voltage = id(yambms${yambms_id}_bulk_voltage).state; + // Float + else if (charging_instruction == "Float") + requested_charge_voltage = id(yambms${yambms_id}_float_voltage).state; + // Stop : keep at nominal voltage + else + requested_charge_voltage = id(yambms${yambms_id}_var_cell_nominal_v) * ${yambms_cell_count}; + + requested_charge_voltage += id(yambms${yambms_id}_charger_offset_v).state + + id(yambms${yambms_id}_var_auto_cvl) + + id(yambms${yambms_id}_var_auto_float) + + id(yambms${yambms_id}_var_auto_custom_cvl); + } + // Publish the sensor id(yambms${yambms_id}_requested_charge_voltage).publish_state(requested_charge_voltage); @@ -1043,6 +1064,7 @@ interval: float auto_limit = std::min({ id(yambms${yambms_id}_var_auto_temperature_ccl), id(yambms${yambms_id}_var_auto_ccl), + id(yambms${yambms_id}_var_auto_ccl_current_taper), id(yambms${yambms_id}_var_auto_soc_limit), id(yambms${yambms_id}_var_auto_eoc), id(yambms${yambms_id}_var_auto_custom_ccl) @@ -1057,7 +1079,17 @@ interval: if (id(yambms${yambms_id}_var_charge_status) != "Init") id(yambms${yambms_id}_var_requested_ccl_init) = true; - + + // +-----------------------------------------------+ + // | Global vars reset | + // +-----------------------------------------------+ + id(yambms${yambms_id}_var_auto_temperature_ccl) = 0; + id(yambms${yambms_id}_var_auto_ccl) = 0; + id(yambms${yambms_id}_var_auto_ccl_current_taper) = 0; + id(yambms${yambms_id}_var_auto_soc_limit) = 0; + id(yambms${yambms_id}_var_auto_eoc) = 0; + id(yambms${yambms_id}_var_auto_custom_ccl) = 0; + id(yambms${yambms_id}_var_charge_current_step) = 1; } @@ -1086,6 +1118,13 @@ interval: // Publish the sensor id(yambms${yambms_id}_requested_discharge_current).publish_state(requested_discharge_current); + // +-----------------------------------------------+ + // | Global vars reset | + // +-----------------------------------------------+ + id(yambms${yambms_id}_var_auto_temperature_dcl) = 0; + id(yambms${yambms_id}_var_auto_dcl) = 0; + id(yambms${yambms_id}_var_auto_custom_dcl) = 0; + id(yambms${yambms_id}_var_requested_dcl_init) = true; id(yambms${yambms_id}_var_discharge_current_step) = 1; } @@ -2256,18 +2295,20 @@ text_sensor: float limit_1 = id(yambms${yambms_id}_var_auto_temperature_ccl); float limit_2 = id(yambms${yambms_id}_var_auto_ccl); - float limit_3 = id(yambms${yambms_id}_var_auto_soc_limit); - float limit_4 = id(yambms${yambms_id}_var_auto_eoc); - float limit_5 = id(yambms${yambms_id}_var_auto_custom_ccl); + float limit_3 = id(yambms${yambms_id}_var_auto_ccl_current_taper); + float limit_4 = id(yambms${yambms_id}_var_auto_soc_limit); + float limit_5 = id(yambms${yambms_id}_var_auto_eoc); + float limit_6 = id(yambms${yambms_id}_var_auto_custom_ccl); - float min_val = std::min({limit_1, limit_2, limit_3, limit_4, limit_5}); + float min_val = std::min({limit_1, limit_2, limit_3, limit_4, limit_5, limit_6}); if (min_val == 0.0f) return {"No Derating"}; if (min_val == limit_1) return {"Temperature Derating"}; if (min_val == limit_2) return {"Auto CCL Derating"}; - if (min_val == limit_3) return {"SoC Limit Derating"}; - if (min_val == limit_4) return {"EOC Derating"}; - if (min_val == limit_5) return {"${custom_ccl_derating_reason}"}; + if (min_val == limit_3) return {"Current Taper Derating"}; + if (min_val == limit_4) return {"SoC Limit Derating"}; + if (min_val == limit_5) return {"EOC Derating"}; + if (min_val == limit_6) return {"${custom_ccl_derating_reason}"}; return {"Unknown"}; # +----------------------------------------+