Skip to content

fix manual soc: manual_soc=0% #2548

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
Jul 11, 2025
Merged

fix manual soc: manual_soc=0% #2548

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc9032a
fix manual soc: manual_soc=0%
LKuemmel Jul 11, 2025
88be508
flake8
LKuemmel Jul 11, 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
10 changes: 7 additions & 3 deletions packages/modules/common/configurable_vehicle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ def update(self, vehicle_update_data: VehicleUpdateData):
self.calculated_soc_state.soc_start = car_state.soc
Pub().pub(f"openWB/set/vehicle/{self.vehicle}/soc_module/calculated_soc_state",
asdict(self.calculated_soc_state))
if vehicle_update_data.soc_timestamp is None or vehicle_update_data.soc_timestamp < car_state.soc_timestamp:
if (vehicle_update_data.soc_timestamp is None or
vehicle_update_data.soc_timestamp <= car_state.soc_timestamp):
# Nur wenn der SoC neuer ist als der bisherige, diesen setzen.
self.store.set(car_state)
elif vehicle_update_data.soc_timestamp > 1e10:
Expand All @@ -99,7 +100,7 @@ def _get_carstate_source(self, vehicle_update_data: VehicleUpdateData) -> SocSou
self.calculated_soc_state.manual_soc):
if isinstance(self.vehicle_config, ManualSoc):
# Wenn ein manueller SoC gesetzt wurde, diesen als neuen Start merken.
if self.calculated_soc_state.manual_soc or self.calculated_soc_state.imported_start is None:
if self.calculated_soc_state.manual_soc is not None or self.calculated_soc_state.imported_start is None:
return SocSource.MANUAL
else:
if vehicle_update_data.plug_state:
Expand Down Expand Up @@ -134,7 +135,10 @@ def _get_carstate_by_source(self, vehicle_update_data: VehicleUpdateData, source
return CarState(soc=vehicle_update_data.soc_from_cp,
soc_timestamp=vehicle_update_data.timestamp_soc_from_cp)
elif source == SocSource.MANUAL:
soc = self.calculated_soc_state.manual_soc or self.calculated_soc_state.soc_start
if self.calculated_soc_state.manual_soc is not None:
soc = self.calculated_soc_state.manual_soc
else:
self.calculated_soc_state.soc_start
self.calculated_soc_state.manual_soc = None
return CarState(soc)

Expand Down