diff --git a/packages/yambms/yambms_core.yaml b/packages/yambms/yambms_core.yaml index cb9340e..dcb75bd 100644 --- a/packages/yambms/yambms_core.yaml +++ b/packages/yambms/yambms_core.yaml @@ -1,4 +1,4 @@ -# Updated : 2026.02.08 +# Updated : 2026.02.10 # Version : 1.7.0 # GitHub : https://github.com/Sleeper85/esphome-yambms @@ -369,19 +369,21 @@ interval: } // +-----------------------------------------------+ - // | Errors bitmask (JK 16bit) | + // | YamBMS Errors bitmask (16bit) | // +-----------------------------------------------+ + // Alarm // Alarm - all BMS are in alarm ? if (id(${yambms_id}_var_errors_bitmask_counter) == id(${yambms_id}_var_bms_counter)) - { id(${yambms_id}_errors_bitmask_alarm).publish_state(id(${yambms_id}_var_errors_bitmask)); - } + // At least one BMS is not in alarm else id(${yambms_id}_errors_bitmask_alarm).publish_state(0); + // Warning id(${yambms_id}_errors_bitmask_warning).publish_state(id(${yambms_id}_var_errors_bitmask)); - // errors_bitmask_counter ( number of BMS in alarms) + + // BMS in alarms count id(${yambms_id}_errors_bitmask_counter).publish_state(id(${yambms_id}_var_errors_bitmask_counter)); // +-----------------------------------------------+ @@ -538,16 +540,23 @@ interval: // | MIN min_cell_voltage | // | MIN min_voltage_cell (cell number) | // +-----------------------------------------------+ - id(${yambms_id}_min_cell_voltage).publish_state(id(${yambms_id}_var_min_cell_voltage)); + float min_cell_v = id(${yambms_id}_var_min_cell_voltage); + id(${yambms_id}_min_cell_voltage).publish_state(min_cell_v); id(${yambms_id}_min_voltage_cell).publish_state(id(${yambms_id}_var_min_voltage_cell)); // +-----------------------------------------------+ // | MAX max_cell_voltage | // | MAX max_voltage_cell (cell number) | // +-----------------------------------------------+ - id(${yambms_id}_max_cell_voltage).publish_state(id(${yambms_id}_var_max_cell_voltage)); + float max_cell_v = id(${yambms_id}_var_max_cell_voltage); + id(${yambms_id}_max_cell_voltage).publish_state(max_cell_v); id(${yambms_id}_max_voltage_cell).publish_state(id(${yambms_id}_var_max_voltage_cell)); + // +-----------------------------------------------+ + // | delta_cell_voltage | + // +-----------------------------------------------+ + id(${yambms_id}_delta_cell_voltage).publish_state(max_cell_v - min_cell_v); + // +-----------------------------------------------+ // | MIN cell_ovp | // +-----------------------------------------------+ @@ -584,9 +593,7 @@ interval: // | Charging allowed | // +-----------------------------------------------+ if (id(${yambms_id}_switch_charging).state && id(${yambms_id}_var_charging_allowed_counter) > 0) - { id(${yambms_id}_charging_allowed).publish_state(true); - } else id(${yambms_id}_charging_allowed).publish_state(false); @@ -594,9 +601,7 @@ interval: // | Discharging allowed | // +-----------------------------------------------+ if (id(${yambms_id}_switch_discharging).state && id(${yambms_id}_var_discharging_allowed_counter) > 0) - { id(${yambms_id}_discharging_allowed).publish_state(true); - } else id(${yambms_id}_discharging_allowed).publish_state(false); @@ -1081,8 +1086,6 @@ switch: optimistic: true entity_category: config - - # +--------------------------------------+ # | binary_sensor | # +--------------------------------------+ @@ -1090,15 +1093,15 @@ binary_sensor: # equalizing - platform: template id: ${yambms_id}_equalizing - name: "${name} ${yambms_name} BMS equalizing state" + name: "${name} ${yambms_name} equalizing state" # charging_allowed - platform: template id: ${yambms_id}_charging_allowed - name: "${name} ${yambms_name} BMS charging allowed" + name: "${name} ${yambms_name} charging allowed" # discharging_allowed - platform: template id: ${yambms_id}_discharging_allowed - name: "${name} ${yambms_name} BMS discharging allowed" + name: "${name} ${yambms_name} discharging allowed" # +--------------------------------------+ # | Discharging Instruction | # +--------------------------------------+ @@ -1366,7 +1369,6 @@ sensor: - or: - throttle: 10s - delta: 0.001 - lambda: return (id(${yambms_id}_max_cell_voltage).state - id(${yambms_id}_min_cell_voltage).state); # total_voltage MEAN - platform: template @@ -1960,23 +1962,18 @@ text_sensor: update_interval: never entity_category: diagnostic lambda: |- - if (!id(${yambms_id}_requested_charge_current).has_state() || - id(${yambms_id}_requested_charge_current).state == 0) - { - return {"Charge Disabled"}; - } + float limit_1 = id(${yambms_id}_var_auto_temperature_ccl); + float limit_2 = id(${yambms_id}_var_auto_eoc); + float limit_3 = id(${yambms_id}_var_auto_ccl); + float limit_4 = id(${yambms_id}_var_auto_ccl_soft_landing); - float t_limit = id(${yambms_id}_var_auto_temperature_ccl); - float e_limit = id(${yambms_id}_var_auto_eoc); - float c_limit = id(${yambms_id}_var_auto_ccl); - - float min_val = std::min({t_limit, e_limit, c_limit}); + float min_val = std::min({limit_1, limit_2, limit_3, limit_4}); if (min_val == 0.0f) return {"No Derating"}; - if (min_val == t_limit) return {"Temperature Derating"}; - if (min_val == e_limit) return {"EOC Derating"}; - if (min_val == c_limit) return {"AutoCCL Derating"}; - + if (min_val == limit_1) return {"Temperature Derating"}; + if (min_val == limit_2) return {"EOC Derating"}; + if (min_val == limit_3) return {"AutoCCL Derating"}; + if (min_val == limit_4) return {"Soft Landing Derating"}; return {"Unknown"}; # +----------------------------------------+ @@ -1989,19 +1986,12 @@ text_sensor: update_interval: never entity_category: diagnostic lambda: |- - if (!id(${yambms_id}_requested_discharge_current).has_state() || - id(${yambms_id}_requested_discharge_current).state == 0) - { - return {"Discharge Disabled"}; - } + float limit_1 = id(${yambms_id}_var_auto_temperature_dcl); + float limit_2 = id(${yambms_id}_var_auto_dcl); - float t_limit = id(${yambms_id}_var_auto_temperature_dcl); - float d_limit = id(${yambms_id}_var_auto_dcl); - - float min_val = std::min(t_limit, d_limit); + float min_val = std::min(limit_1, limit_2); if (min_val == 0.0f) return {"No Derating"}; - if (min_val == t_limit) return {"Temperature Derating"}; - if (min_val == d_limit) return {"AutoDCL Derating"}; - + if (min_val == limit_1) return {"Temperature Derating"}; + if (min_val == limit_2) return {"AutoDCL Derating"}; return {"Unknown"};