Skip to content

Phase processing fixes #673

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
merged 1 commit into from
Nov 5, 2022
Merged

Phase processing fixes #673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions custom_components/ocpp/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@ def average_of_nonzero(values):
self._metrics[measurand].extra_attr[om.context.value] = context

line_phases = [Phase.l1.value, Phase.l2.value, Phase.l3.value]
line_to_neutral_phases = [Phase.l1_n.value, Phase.l2_n.value, Phase.l2_n.value]
line_to_neutral_phases = [Phase.l1_n.value, Phase.l2_n.value, Phase.l3_n.value]
line_to_line_phases = [Phase.l1_l2.value, Phase.l2_l3.value, Phase.l3_l1.value]

for metric, phase_info in measurand_data.items():
Expand All @@ -1027,12 +1027,7 @@ def average_of_nonzero(values):
metric_value = average_of_nonzero(
[phase_info.get(phase, 0) for phase in line_phases]
)
elif metric in [
Measurand.current_import.value,
Measurand.current_export.value,
Measurand.power_active_import.value,
Measurand.power_active_export.value,
]:
else:
if not phase_info.keys().isdisjoint(line_phases):
metric_value = sum(
phase_info.get(phase, 0) for phase in line_phases
Expand Down