From 3ca33c8fbeb0c348a0fa51da5120c4239883423d Mon Sep 17 00:00:00 2001 From: rleidner Date: Sat, 28 Mar 2026 15:47:15 +0100 Subject: [PATCH] Fix odometer issue in cupra and skoda SoC modules --- packages/modules/vehicles/cupra/soc.py | 6 +++--- packages/modules/vehicles/skoda/soc.py | 6 +++--- packages/modules/vehicles/skoda/soc_test.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/modules/vehicles/cupra/soc.py b/packages/modules/vehicles/cupra/soc.py index b5326c192b..cc6cefb0c2 100755 --- a/packages/modules/vehicles/cupra/soc.py +++ b/packages/modules/vehicles/cupra/soc.py @@ -16,9 +16,9 @@ def fetch(vehicle_update_data: VehicleUpdateData, config: Cupra, vehicle: int) -> CarState: - soc, range, soc_ts, soc_tsX = api.fetch_soc(config, vehicle) - log.info("Result: soc=" + str(soc)+", range=" + str(range) + "@" + soc_ts) - return CarState(soc=soc, range=range, soc_timestamp=soc_tsX) + soc, range, soc_ts, soc_tsX, odometer = api.fetch_soc(config, vehicle) + log.info("Result: soc=" + str(soc)+", range=" + str(range) + "@" + soc_ts + ", odometer=" + str(odometer)) + return CarState(soc=soc, range=range, soc_timestamp=soc_tsX, odometer=odometer) def create_vehicle(vehicle_config: Cupra, vehicle: int): diff --git a/packages/modules/vehicles/skoda/soc.py b/packages/modules/vehicles/skoda/soc.py index c2de41bb2d..2032f89c24 100755 --- a/packages/modules/vehicles/skoda/soc.py +++ b/packages/modules/vehicles/skoda/soc.py @@ -16,9 +16,9 @@ def fetch(vehicle_update_data: VehicleUpdateData, config: Skoda, vehicle: int) -> CarState: - soc, range, soc_ts, soc_tsX = api.fetch_soc(config, vehicle) - log.info("Result: soc=" + str(soc)+", range=" + str(range) + "@" + soc_ts) - return CarState(soc=soc, range=range, soc_timestamp=soc_tsX) + soc, range, soc_ts, soc_tsX, odometer = api.fetch_soc(config, vehicle) + log.info("Result: soc=" + str(soc)+", range=" + str(range) + "@" + soc_ts + ", odometer=" + str(odometer)) + return CarState(soc=soc, range=range, soc_timestamp=soc_tsX, odometer=odometer) def create_vehicle(vehicle_config: Skoda, vehicle: int): diff --git a/packages/modules/vehicles/skoda/soc_test.py b/packages/modules/vehicles/skoda/soc_test.py index bd57070bf7..807d6ec715 100644 --- a/packages/modules/vehicles/skoda/soc_test.py +++ b/packages/modules/vehicles/skoda/soc_test.py @@ -14,7 +14,7 @@ class TestSkoda: @pytest.fixture(autouse=True) def set_up(self, monkeypatch): self.mock_context_exit = Mock(return_value=True) - self.mock_fetch_soc = Mock(name="fetch_soc", return_value=(50, 250, "2025-10-18T10:00:00Z", 1760822400.0)) + self.mock_fetch_soc = Mock(name="fetch_soc", return_value=(50, 250, "2025-10-18T10:00:00Z", 1760822400.0, 0)) self.mock_value_store = Mock(name="value_store") monkeypatch.setattr(api, "fetch_soc", self.mock_fetch_soc) monkeypatch.setattr(store, "get_car_value_store", Mock(return_value=self.mock_value_store))