Repository navigation
Consumer: voltages/currents bei Änderung von connected_phases - #4071
Merged
LKuemmel merged 5 commits intoOct 9, 2026
Merged
Conversation
…e_1 neu berechnen Wurden bisher nur einmalig (bei None) berechnet und immer ab Index 0 befüllt. Änderte sich connected_phases oder phase_1 nachträglich, blieb das alte Array mit falscher Länge bzw. falschem Index stehen - das zeigte in der Modulübersicht Werte für nicht mehr angeschlossene Phasen an und passte nicht mehr zum phasenkorrekten required_currents aus set_control_parameter().
LKuemmel
requested changes
Oct 9, 2026
Comment on lines
+51
to
+68
| # Index wie required_currents in set_control_parameter() am EVU-Phasen-Index ausrichten, nicht an 0. | ||
| try: | ||
| connected_evu_phases = { | ||
| convert_single_evu_phase_to_cp_phase(self.data.config.phase_1, i) | ||
| for i in range(0, self.data.config.connected_phases)} | ||
| except KeyError: | ||
| connected_evu_phases = set(range(0, self.data.config.connected_phases)) | ||
| # neu berechnen, wenn sich connected_phases oder phase_1 geändert haben, nicht nur bei None | ||
| phase_config_changed = (self.data.get.voltages is None or | ||
| len(self.data.get.voltages) != 3 or | ||
| {i for i, v in enumerate(self.data.get.voltages) if v} != connected_evu_phases) | ||
| if phase_config_changed: | ||
| self.data.get.voltages = [230 if i in connected_evu_phases else 0 for i in range(3)] | ||
| if self.data.get.currents is None or phase_config_changed: | ||
| self.data.get.currents = [ | ||
| (self.data.get.power / self.data.config.connected_phases / self.data.get.voltages[i]) | ||
| if i in connected_evu_phases else 0 | ||
| for i in range(3)] |
Contributor
There was a problem hiding this comment.
Die Phasenverdrehung macht das Lastmanagement. Wenn ein Verbraucher seine Ströme selbst misst, fängt er üblicherweise intern auf L1 an.
Es müsste so sein:
Suggested change
| # Index wie required_currents in set_control_parameter() am EVU-Phasen-Index ausrichten, nicht an 0. | |
| try: | |
| connected_evu_phases = { | |
| convert_single_evu_phase_to_cp_phase(self.data.config.phase_1, i) | |
| for i in range(0, self.data.config.connected_phases)} | |
| except KeyError: | |
| connected_evu_phases = set(range(0, self.data.config.connected_phases)) | |
| # neu berechnen, wenn sich connected_phases oder phase_1 geändert haben, nicht nur bei None | |
| phase_config_changed = (self.data.get.voltages is None or | |
| len(self.data.get.voltages) != 3 or | |
| {i for i, v in enumerate(self.data.get.voltages) if v} != connected_evu_phases) | |
| if phase_config_changed: | |
| self.data.get.voltages = [230 if i in connected_evu_phases else 0 for i in range(3)] | |
| if self.data.get.currents is None or phase_config_changed: | |
| self.data.get.currents = [ | |
| (self.data.get.power / self.data.config.connected_phases / self.data.get.voltages[i]) | |
| if i in connected_evu_phases else 0 | |
| for i in range(3)] | |
| if self.data.get.voltages == [230.0]*3: | |
| self.data.get.voltages = [230 if i < self.data.config.connected_phases else 0 for i in range(0, self.data.config.connected_phases)] | |
| if self.data.get.currents == [0]*3: | |
| for i in range(0, self.data.config.connected_phases): | |
| self.data.get.currents[i] = (self.data.get.power / | |
| self.data.config.connected_phases / | |
| self.data.get.voltages[i]) |
Bin jetzt auch drüber gestolpert. Die Default-Werte in der consumer.py müssen analog zu den Zählern und Ladepunkten so sein:
currents: List[float] = field(default_factory=currents_list_factory) und voltages: List[float] = field(default_factory=voltages_list_factory)
Collaborator
Author
There was a problem hiding this comment.
Habs mal so umgebaut, passts so für dich?
LKuemmel
requested changes
Oct 9, 2026
Co-authored-by: LKuemmel <76958050+LKuemmel@users.noreply.github.com>
… into fix-consumer-stale-phase-values
LKuemmel
approved these changes
Oct 9, 2026
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
2 participants
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.
#3908 (comment)
voltages/currents eines Verbrauchers wurden bisher nur einmalig (bei None) berechnet und immer ab Index 0 befüllt - unabhängig von connected_phases und phase_1.
is None). Wurde connected_phases später geändert (zB 3 auf 1 Phase), blieb das alte, zu lange Array stehen.voltages/currents sind jetzt immer 3 Elemente lang, der Wert liegt am über phase_1 korrekt gemappten EVU-Index. Neuberechnung erfolgt, sobald sich connected_phases oder phase_1 vom zuletzt berechneten Zustand unterscheiden, nicht mehr nur einmalig.