Skip to content
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

Force update if charging service event contains no data #617

Merged
merged 3 commits into from
Feb 11, 2025
Merged

Force update if charging service event contains no data #617

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96b2b5e
Force update if charging even contain no data
fursov Feb 6, 2025
4f29a38
Merge branch 'main' into update-on-charging-event
WebSpider Feb 10, 2025
795d3ac
Fix typo: some_chargind_data_missing -> some_charging_data_missing
fursov Feb 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
68 changes: 40 additions & 28 deletions custom_components/myskoda/coordinator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@
)
from myskoda.models.info import CapabilityId
from myskoda.models.operation_request import OperationName, OperationStatus
from myskoda.models.service_event import (
ServiceEventChargingData,
ServiceEventData,
)
from myskoda.models.user import User
from myskoda.mqtt import EventCharging, EventType

Expand Down Expand Up @@ -321,30 +317,38 @@ async def _on_charging_event(self, event: EventCharging):
await self.update_driving_range()

event_data = event.event.data
match event_data:
case ServiceEventChargingData():
if vehicle.charging and (status := vehicle.charging.status):
if event_data.charged_range:
status.battery.remaining_cruising_range_in_meters = (
event_data.charged_range * 1000
)
if event_data.soc:
status.battery.state_of_charge_in_percent = event_data.soc
if event_data.time_to_finish:
status.remaining_time_to_fully_charged_in_minutes = (
event_data.time_to_finish
)
if event_data.state:
status.state = event_data.state
if vehicle.driving_range:
if event_data.soc:
vehicle.driving_range.primary_engine_range.current_soc_in_percent = event_data.soc
if event_data.charged_range:
vehicle.driving_range.primary_engine_range.remaining_range_in_km = event_data.charged_range
self.set_updated_vehicle(vehicle)
case ServiceEventData():
if not update_charging_request_sent:
await self.update_charging()
if vehicle.charging and (status := vehicle.charging.status):
if event_data.charged_range:
status.battery.remaining_cruising_range_in_meters = (
event_data.charged_range * 1000
)
if event_data.soc:
status.battery.state_of_charge_in_percent = event_data.soc
if event_data.time_to_finish:
status.remaining_time_to_fully_charged_in_minutes = (
event_data.time_to_finish
)
if event_data.state:
status.state = event_data.state
if vehicle.driving_range:
if event_data.soc:
vehicle.driving_range.primary_engine_range.current_soc_in_percent = (
event_data.soc
)
if event_data.charged_range:
vehicle.driving_range.primary_engine_range.remaining_range_in_km = (
event_data.charged_range
)
some_charging_data_missing = (
event_data.charged_range is None
or event_data.soc is None
or event_data.state is None
)
if some_charging_data_missing and not update_charging_request_sent:
# After update is done, the set_updated_vehicle is called there
await self.update_charging()
else:
self.set_updated_vehicle(vehicle)

async def _on_access_event(self, event: EventAccess):
await self.update_vehicle()
Expand Down Expand Up @@ -392,6 +396,14 @@ async def _update_charging(self) -> None:
if charging:
vehicle = self.data.vehicle
vehicle.charging = charging
# Update driving range similarly to the received charging service event
if vehicle.driving_range and charging.status:
vehicle.driving_range.primary_engine_range.current_soc_in_percent = (
charging.status.battery.state_of_charge_in_percent
)
vehicle.driving_range.primary_engine_range.remaining_range_in_km = (
charging.status.battery.remaining_cruising_range_in_meters
)
self.set_updated_vehicle(vehicle)

async def _update_air_conditioning(self) -> None:
Expand Down