diff --git a/packages/bms/bms_combine.yaml b/packages/bms/bms_combine.yaml index fb48ebc..12399eb 100644 --- a/packages/bms/bms_combine.yaml +++ b/packages/bms/bms_combine.yaml @@ -84,22 +84,26 @@ interval: id(${yambms_id}_var_errors_bitmask_counter) += 1; // errors_bitmask_counter } - // TOTAL charging_allowed_counter - // TOTAL max_charge_current if (id(bms${bms_id}_charging_allowed).state) { + // TOTAL charging_allowed_counter id(${yambms_id}_var_charging_allowed_counter) += 1; + // TOTAL max_charge_current id(${yambms_id}_var_total_max_charge_current) += id(bms${bms_id}_max_charge_current).state; } + // TOTAL bms_blocking_charge_counter + else id(${yambms_id}_var_bms_blocking_charge_counter) += 1; - // TOTAL discharging_allowed_counter - // TOTAL max_discharge_current if (id(bms${bms_id}_discharging_allowed).state) { + // TOTAL discharging_allowed_counter id(${yambms_id}_var_discharging_allowed_counter) += 1; + // TOTAL max_discharge_current id(${yambms_id}_var_total_max_discharge_current) += id(bms${bms_id}_max_discharge_current).state; } + // TOTAL bms_blocking_discharge_counter + else id(${yambms_id}_var_bms_blocking_discharge_counter) += 1; // TOTAL total_voltage id(${yambms_id}_var_bms_total_voltage) += id(bms${bms_id}_total_voltage).state; @@ -178,7 +182,7 @@ interval: { // To combine bms counter id(${yambms_id}_var_to_combine_bms_counter) -= 1; - + // Uncombined id(bms${bms_id}_combined) = false; } diff --git a/packages/yambms/yambms_combine.yaml b/packages/yambms/yambms_combine.yaml index 406f271..7de8ffc 100644 --- a/packages/yambms/yambms_combine.yaml +++ b/packages/yambms/yambms_combine.yaml @@ -51,6 +51,14 @@ globals: type: int restore_value: no initial_value: '0' + - id: ${yambms_id}_var_bms_blocking_charge_counter + type: int + restore_value: no + initial_value: '0' + - id: ${yambms_id}_var_bms_blocking_discharge_counter + type: int + restore_value: no + initial_value: '0' - id: ${yambms_id}_var_total_cell_count type: int restore_value: no @@ -299,16 +307,18 @@ interval: id(${yambms_id}_charging_allowed).publish_state(true); else id(${yambms_id}_charging_allowed).publish_state(false); - // bms_blocking_charge - id(${yambms_id}_bms_blocking_charge).publish_state(id(${yambms_id}_var_bms_counter) - id(${yambms_id}_var_charging_allowed_counter)); - + // BMS discharging allowed if (id(${yambms_id}_var_to_combine_bms_counter) && 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); - // bms_blocking_discharge - id(${yambms_id}_bms_blocking_discharge).publish_state(id(${yambms_id}_var_bms_counter) - id(${yambms_id}_var_discharging_allowed_counter)); + + // BMS blocking_charge_counter + id(${yambms_id}_bms_blocking_charge).publish_state(id(${yambms_id}_var_bms_blocking_charge_counter)); + + // BMS blocking_discharge_counter + id(${yambms_id}_bms_blocking_discharge).publish_state(id(${yambms_id}_var_bms_blocking_discharge_counter)); // Global vars reset id(${yambms_id}_var_errors_bitmask) = 0; @@ -340,6 +350,8 @@ interval: id(${yambms_id}_var_equalizing_counter) = 0; id(${yambms_id}_var_charging_allowed_counter) = 0; id(${yambms_id}_var_discharging_allowed_counter) = 0; + id(${yambms_id}_var_bms_blocking_charge_counter) = 0; + id(${yambms_id}_var_bms_blocking_discharge_counter) = 0; // The devices are once again authorized to communicate their informations id(${yambms_id}_var_to_combine_bms_number) = 1;