Skip to content

Add total trip consumption attributes for EVs #227

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add total trip consumption attributes for EVs #227

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbcb68e
Add total trip consumption attributes for EVs
bnavigator Jan 3, 2025
66ec7ce
fix lint
bnavigator Jan 9, 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
12 changes: 11 additions & 1 deletion weconnect/elements/trip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ def __init__(
self.averageSpeed_kmph = AddressableAttribute(localAddress='averageSpeed_kmph', parent=self, value=None, valueType=int)
self.averageAuxConsumption = AddressableAttribute(localAddress='averageAuxConsumption', parent=self, value=None, valueType=float)
self.averageRecuperation = AddressableAttribute(localAddress='averageRecuperation', parent=self, value=None, valueType=float)
self.totalAuxConsumption_Kwh = AddressableAttribute(localAddress='totalAuxConsumption_Kwh', parent=self, value=None, valueType=float)
self.totalElectricConsumption_kwh = AddressableAttribute(localAddress='totalElectricConsumption_kwh', parent=self, value=None, valueType=float)

self.fixAPI = fixAPI

Expand All @@ -58,6 +60,8 @@ def update( # noqa: C901 # pylint: disable=too-many-branches
self.averageSpeed_kmph.fromDict(fromDict, 'averageSpeed_kmph')
self.averageAuxConsumption.fromDict(fromDict, 'averageAuxConsumption')
self.averageRecuperation.fromDict(fromDict, 'averageRecuperation')
self.totalAuxConsumption_Kwh.fromDict(fromDict, 'totalAuxConsumption_Kwh')
self.totalElectricConsumption_kwh.fromDict(fromDict, 'totalElectricConsumption_kwh')

for key, value in {key: value for key, value in fromDict.items()
if key not in ['id',
Expand All @@ -72,7 +76,9 @@ def update( # noqa: C901 # pylint: disable=too-many-branches
'averageElectricConsumption',
'averageSpeed_kmph',
'averageAuxConsumption',
'averageRecuperation']}.items():
'averageRecuperation',
'totalAuxConsumption_Kwh',
'totalElectricConsumption_kwh']}.items():
LOG.warning('%s: Unknown attribute %s with value %s', self.getGlobalAddress(), key, value)

class TripType(Enum):
Expand Down Expand Up @@ -109,5 +115,9 @@ def __str__(self): # noqa: C901
returnString += f'Average Aux Consumption: {self.averageAuxConsumption.value}\n'
if self.averageRecuperation.enabled:
returnString += f'Average Recuperation: {self.averageRecuperation.value}\n'
if self.totalAuxConsumption_Kwh.enabled:
returnString += f'Total Aux Consumption: {self.totalAuxConsumption_Kwh}'
if self.totalElectricConsumption_kwh.enabled:
returnString += f'Total Electric Consumption: {self.totalElectricConsumption_kwh}'
returnString += '\n'
return returnString