phase switch delay: fix consideration of own reserved required power#3666
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Adjusts the EV phase-switching logic so phase switch delay decisions correctly account for power already reserved by the same chargepoint (Ticket #66006152), and updates unit tests accordingly.
Changes:
- Passes computed
surplusinto_check_phase_switch_conditionsinstead of re-reading surplus inside that helper. - During
PHASE_SWITCH_DELAY, adjusts surplus evaluation to account for already-reserved switching power. - Updates
auto_phase_switch_test.pyto reflect the new surplus handling and helper signature.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| packages/control/ev/ev.py | Refactors phase-switch condition checks to accept a surplus argument and adjusts surplus computation during phase-switch delay. |
| packages/control/auto_phase_switch_test.py | Updates test cases and helper invocation to match the refactored API and new surplus semantics. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+339
to
+345
| all_surplus = data.data.counter_all_data.get_evu_counter().get_usable_surplus(feed_in_yield) | ||
| if control_parameter.state == ChargepointState.PHASE_SWITCH_DELAY: | ||
| # eigene reservierte Leistung abziehen, wenn die Verzögerung für die Umschaltung läuft, | ||
| # da diese Leistung bereits für die Umschaltung reserviert ist. | ||
| surplus = all_surplus + required_reserved_power | ||
| else: | ||
| surplus = all_surplus |
| # execution | ||
| phase_switch, condition_msg = ev._check_phase_switch_conditions( | ||
| ChargeTemplate(), | ||
| phase_switch, condition_msg = ev._check_phase_switch_conditions( # type: ignore |
| # execution | ||
| phase_switch, condition_msg = ev._check_phase_switch_conditions( | ||
| ChargeTemplate(), | ||
| phase_switch, condition_msg = ev._check_phase_switch_conditions( # type: ignore |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ticket #66006152