Skip to content

Fixed #1466 #1477

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 10 commits into from
Mar 1, 2025
Merged

Fixed #1466 #1477

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
301bc05
Fixed #1466
altserg Jan 9, 2025
9866fb0
Fixed #1466, fixed linting issues
altserg Jan 9, 2025
ad8e703
Attept to pass the automatic test suite
altserg Jan 9, 2025
95dc1e1
More elegant way to fix the issue.
altserg Jan 12, 2025
99374cb
Merge branch 'lbbrhzn:main' into Fix-1466
altserg Jan 13, 2025
6dc5fb8
1. Updated the fix to pass the automatic test system.
altserg Jan 13, 2025
87ad713
Merge branch 'lbbrhzn:main' into Fix-1466
altserg Jan 22, 2025
823d6d0
Merge branch 'main' into Fix-1466
lbbrhzn Mar 1, 2025
550b989
Merge branch 'main' into Fix-1466
lbbrhzn Mar 1, 2025
6a69690
Merge branch 'main' into Fix-1466
lbbrhzn Mar 1, 2025
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
28 changes: 19 additions & 9 deletions custom_components/ocpp/chargepoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@
from ocpp.charge_point import ChargePoint as cp
from ocpp.v16 import call as callv16
from ocpp.v16 import call_result as call_resultv16
from ocpp.v16.enums import UnitOfMeasure, AuthorizationStatus, Measurand, Phase
from ocpp.v16.enums import (
UnitOfMeasure,
AuthorizationStatus,
Measurand,
Phase,
ReadingContext,
)
from ocpp.v201 import call as callv201
from ocpp.v201 import call_result as call_resultv201
from ocpp.messages import CallError
Expand Down Expand Up @@ -626,15 +632,19 @@ def process_measurands(
measurand == DEFAULT_MEASURAND
and self._charger_reports_session_energy
):
if is_transaction:
self._metrics[csess.session_energy.value].value = value
self._metrics[csess.session_energy.value].unit = unit
self._metrics[csess.session_energy.value].extra_attr[
cstat.id_tag.name
] = self._metrics[cstat.id_tag.value].value
# Ignore messages with Transaction Begin context
if context != ReadingContext.transaction_begin.value:
if is_transaction:
self._metrics[csess.session_energy.value].value = value
self._metrics[csess.session_energy.value].unit = unit
self._metrics[csess.session_energy.value].extra_attr[
cstat.id_tag.name
] = self._metrics[cstat.id_tag.value].value
else:
self._metrics[measurand].value = value
self._metrics[measurand].unit = unit
else:
self._metrics[measurand].value = value
self._metrics[measurand].unit = unit
continue
else:
self._metrics[measurand].value = value
self._metrics[measurand].unit = unit
Expand Down
Loading