Skip to content

chargelog actual charging time: fix timestamp #2892

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
Nov 3, 2025
Merged

chargelog actual charging time: fix timestamp #2892

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
6a7daf6
fix chargelog actual charging time: fix timestamp
LKuemmel Nov 3, 2025
8b943d2
pytest
LKuemmel Nov 3, 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
4 changes: 2 additions & 2 deletions packages/control/chargelog/chargelog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def calculate_charged_energy_by_source(cp, processed_entries, reference_entries,
charged_energy = (reference_entries[-1]["cp"][f"cp{cp.num}"]["imported"] -
reference_entries[0]["cp"][f"cp{cp.num}"]["imported"])
elif reference == ReferenceTime.END:
if (timecheck.create_timestamp()-cp.data.set.log.timestamp_start_charging) < MEASUREMENT_LOGGING_INTERVAL:
if ((timecheck.create_timestamp()-cp.data.set.log.timestamp_mode_switch) < MEASUREMENT_LOGGING_INTERVAL):
charged_energy = cp.data.set.log.imported_since_mode_switch
else:
log.debug(f"cp.data.get.imported {cp.data.get.imported}")
Expand Down Expand Up @@ -351,7 +351,7 @@ def _get_reference_position(cp, create_log_entry: bool) -> ReferenceTime:
else:
# Wenn der Ladevorgang erst innerhalb des letzten 5 Min Intervalls gestartet wurde,
# ist das das erste Zwischenergebnis.
if (timecheck.create_timestamp() - cp.data.set.log.timestamp_start_charging) < MEASUREMENT_LOGGING_INTERVAL:
if (timecheck.create_timestamp() - cp.data.set.log.timestamp_mode_switch) < MEASUREMENT_LOGGING_INTERVAL:
return ReferenceTime.START
else:
return ReferenceTime.MIDDLE
Expand Down
8 changes: 4 additions & 4 deletions packages/control/chargelog/chargelog_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def mock_daily_log(monkeypatch):
def test_calc_charge_cost_reference_middle(mock_data, monkeypatch):
cp = Chargepoint(4, None)
cp.data.set.log.imported_since_plugged = cp.data.set.log.imported_since_mode_switch = 3950
cp.data.set.log.timestamp_start_charging = 1652682600 # 8:30
cp.data.set.log.timestamp_mode_switch = 1652682600 # 8:30
cp.data.get.imported = 4050
cp.data.set.log.charged_energy_by_source = {'bat': 100, 'cp': 0, 'grid': 100, 'pv': 100}
daily_log = mock_daily_log(monkeypatch)
Expand All @@ -69,7 +69,7 @@ def test_calc_charge_cost_reference_middle(mock_data, monkeypatch):
def test_calc_charge_cost_reference_start(mock_data, monkeypatch):
cp = Chargepoint(4, None)
cp.data.set.log.imported_since_plugged = cp.data.set.log.imported_since_mode_switch = 100
cp.data.set.log.timestamp_start_charging = 1652683230 # 8:40:30
cp.data.set.log.timestamp_mode_switch = 1652683230 # 8:40:30
cp.data.get.imported = 4100
cp.data.set.log.charged_energy_by_source = {'bat': 0, 'cp': 0, 'grid': 0, 'pv': 0}
daily_log = mock_daily_log(monkeypatch)
Expand All @@ -85,7 +85,7 @@ def test_calc_charge_cost_reference_start(mock_data, monkeypatch):
def test_calc_charge_cost_reference_end(mock_data, monkeypatch):
cp = Chargepoint(4, None)
cp.data.set.log.imported_since_plugged = cp.data.set.log.imported_since_mode_switch = 3950
cp.data.set.log.timestamp_start_charging = 1652682600 # 8:30
cp.data.set.log.timestamp_mode_switch = 1652682600 # 8:30
cp.data.get.imported = 4100
cp.data.set.log.charged_energy_by_source = {'grid': 1243, 'pv': 386, 'bat': 671, 'cp': 0.0}
daily_log = mock_daily_log(monkeypatch)
Expand All @@ -100,7 +100,7 @@ def test_calc_charge_cost_reference_end(mock_data, monkeypatch):
def test_calc_charge_cost_reference_middle_day_change(mock_data, monkeypatch):
cp = Chargepoint(4, None)
cp.data.set.log.imported_since_plugged = cp.data.set.log.imported_since_mode_switch = 3950
cp.data.set.log.timestamp_start_charging = 1652682600 # 8:30
cp.data.set.log.timestamp_mode_switch = 1652682600 # 8:30
cp.data.get.imported = 4050
cp.data.set.log.charged_energy_by_source = {'bat': 100, 'cp': 0, 'grid': 100, 'pv': 100}
yesterday_daily_log = {"entries": [{'bat': {'all': {'exported': 2000, 'imported': 2000, 'soc': 100},
Expand Down