Skip to content

scheduled charging: consider efficiency #3393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 2 commits into from
May 26, 2026
Merged

scheduled charging: consider efficiency #3393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b41252a
scheduled cahrging: consider efficiency
LKuemmel May 26, 2026
5582dd4
review
LKuemmel May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions packages/control/ev/charge_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,41 +417,44 @@ def _calc_remaining_time(self,
charging_type: str,
control_parameter_phases: int,
soc_request_interval_offset: int,
bidi_state: BidiState) -> SelectedPlan:
bidi_state: BidiState) -> Tuple[float, float, int, float]:
bidi = bidi_state == BidiState.BIDI_CAPABLE and plan.bidi_charging_enabled
battery_capacity = ev_template.data.battery_capacity
efficiency = ev_template.data.efficiency

def calc_for_phases(phases_to_use: int) -> Tuple[float, float]:
return self._calculate_duration(
plan,
soc,
battery_capacity,
efficiency,
used_amount,
phases_to_use,
charging_type,
ev_template,
bidi)

if bidi:
duration, missing_amount = self._calculate_duration(
plan, soc, ev_template.data.battery_capacity,
used_amount, control_parameter_phases, charging_type, ev_template, bidi)
duration, missing_amount = calc_for_phases(control_parameter_phases)
remaining_time = plan_end_time - duration
phases = control_parameter_phases
elif plan.phases_to_use == 0:
if max_hw_phases == 1:
duration, missing_amount = self._calculate_duration(
plan, soc, ev_template.data.battery_capacity,
used_amount, 1, charging_type, ev_template, bidi)
duration, missing_amount = calc_for_phases(1)
remaining_time = plan_end_time - duration
phases = 1
elif phase_switch_supported is False:
duration, missing_amount = self._calculate_duration(
plan, soc, ev_template.data.battery_capacity, used_amount, control_parameter_phases,
charging_type, ev_template, bidi)
duration, missing_amount = calc_for_phases(control_parameter_phases)
phases = control_parameter_phases
remaining_time = plan_end_time - duration
elif plan.et_active:
duration, missing_amount = self._calculate_duration(
plan, soc, ev_template.data.battery_capacity, used_amount, max_hw_phases,
charging_type, ev_template, bidi)
duration, missing_amount = calc_for_phases(max_hw_phases)
phases = max_hw_phases
remaining_time = plan_end_time - duration
else:
duration_3p, missing_amount = self._calculate_duration(
plan, soc, ev_template.data.battery_capacity, used_amount, max_hw_phases,
charging_type, ev_template, bidi)
duration_3p, missing_amount = calc_for_phases(max_hw_phases)
remaining_time_3p = plan_end_time - duration_3p
duration_1p, missing_amount = self._calculate_duration(
plan, soc, ev_template.data.battery_capacity, used_amount, 1,
charging_type, ev_template, bidi)
duration_1p, missing_amount = calc_for_phases(1)
remaining_time_1p = plan_end_time - duration_1p
# Kurz vor dem nächsten Abfragen des SoC, wenn noch der alte SoC da ist, kann es sein, dass die Zeit
# für 1p nicht mehr reicht, weil die Regelung den neuen SoC noch nicht kennt.
Expand All @@ -466,11 +469,9 @@ def _calc_remaining_time(self,
phases = 1
log.debug(f"Dauer 1p: {duration_1p}, Dauer 3p: {duration_3p}")
elif plan.phases_to_use == 3 or plan.phases_to_use == 1:
duration, missing_amount = self._calculate_duration(
plan, soc, ev_template.data.battery_capacity,
used_amount, min(plan.phases_to_use, max_hw_phases), charging_type, ev_template, bidi)
remaining_time = plan_end_time - duration
phases = min(plan.phases_to_use, max_hw_phases)
duration, missing_amount = calc_for_phases(phases)
remaining_time = plan_end_time - duration

log.debug(f"Verbleibende Zeit bis zum Ladestart [s]:{remaining_time}, Dauer [h]: {duration/3600}")
return remaining_time, missing_amount, phases, duration
Expand All @@ -479,6 +480,7 @@ def _calculate_duration(self,
plan: ScheduledChargingPlan,
soc: Optional[float],
battery_capacity: float,
efficiency: float,
used_amount: float,
phases: int,
charging_type: str,
Expand All @@ -487,7 +489,7 @@ def _calculate_duration(self,

if plan.limit.selected == "soc":
if soc is not None:
missing_amount = ((plan.limit.soc_scheduled - soc) / 100) * battery_capacity
missing_amount = ((plan.limit.soc_scheduled - soc) / 100) * battery_capacity / (efficiency / 100)
else:
raise ValueError("Um Zielladen mit SoC-Ziel nutzen zu können, bitte ein SoC-Modul konfigurieren.")
else:
Expand Down
6 changes: 3 additions & 3 deletions packages/control/ev/charge_template_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ def test_calc_remaining_time(phases_to_use,
@pytest.mark.parametrize(
"selected, phases, bidi_charging_enabled, expected_duration, expected_missing_amount",
[
pytest.param("soc", 1, False, 10062.111801242236, 9000, id="soc, one phase"),
pytest.param("soc", 1, False, 11180.124223602485, 10000, id="soc, one phase"),
pytest.param("amount", 2, False, 447.2049689440994, 800, id="amount, two phases"),
pytest.param("soc", 2, True, 3240.0, 9000, id="bidi"),
pytest.param("soc", 2, True, 3600.0, 10000, id="bidi"),
])
def test_calculate_duration(selected: str,
phases: int,
Expand All @@ -184,7 +184,7 @@ def test_calculate_duration(selected: str,
plan.limit.selected = selected
# execution
duration, missing_amount = ct._calculate_duration(
plan, 60, 45000, 200, phases, ChargingType.AC.value, EvTemplate(), bidi_charging_enabled)
plan, 60, 45000, 90, 200, phases, ChargingType.AC.value, EvTemplate(), bidi_charging_enabled)

Comment on lines 169 to 188
# evaluation
assert duration == expected_duration
Expand Down
Loading