diff --git a/src/types.ts b/src/types.ts index ef3ea1d..a671133 100644 --- a/src/types.ts +++ b/src/types.ts @@ -77,11 +77,11 @@ export const sensorDeviceFilters: { distanceStart: { suffix: '_distancestart' }, liquidConsumptionReset: { suffix: '_liquidconsumptionreset' }, liquidConsumptionStart: { suffix: '_liquidconsumptionstart' }, - electicConsumptionReset: { suffix: '_electricconsumptionreset' }, + electricConsumptionReset: { suffix: '_electricconsumptionreset' }, electricConsumptionStart: { suffix: '_electricconsumptionstart' }, odometer: { suffix: '_odometer' }, rangeLiquid: { suffix: '_rangeliquid' }, - rangeElectric: { suffix: '_rangeelectric' }, + rangeElectric: { suffix: '_rangeelectrickm' }, fuelLevel: { suffix: '_tanklevelpercent' }, adBlueLevel: { suffix: '_tankleveladblue' }, ecoScoreTotal: { suffix: '_ecoscoretotal' }, diff --git a/src/vehicle-info-card.ts b/src/vehicle-info-card.ts index 14e8fec..04eb473 100644 --- a/src/vehicle-info-card.ts +++ b/src/vehicle-info-card.ts @@ -182,6 +182,7 @@ export class VehicleCard extends LitElement { } } } + console.log('sensors:', entityIds); return entityIds; } @@ -608,19 +609,18 @@ export class VehicleCard extends LitElement { private generateDataRow( title: string, - data: Array<{ key: string; name?: string; icon?: string }>, // icon is optional now + data: Array<{ key: string; name?: string; icon?: string; state?: string }>, // icon is optional now entityCollection: any, ): TemplateResult { return html`
${title}
- ${data.map(({ key, name, icon }) => { + ${data.map(({ key, name, icon, state }) => { const entity = entityCollection[key]; const entityId = entity?.entity_id; const entityName = name ?? entity?.original_name; - let entityState = entityId ? this.getEntityState(entityId) : ''; + let entityState = state ?? this.getEntityState(entityId); const unitOfMeasurement = entityId ? this.getAttrUnitOfMeasurement(entityId) : ''; - // Render correct formated state if (!isNaN(parseFloat(entityState)) && entityState !== '') { entityState = formatNumber(entityState, this.hass.locale); @@ -649,12 +649,13 @@ export class VehicleCard extends LitElement { private _renderDefaultTripCard(): TemplateResult | void { const generateDataArray = ( - keys: { key: string; name?: string; icon?: string }[], - ): { key: string; name: string; icon: string }[] => { - return keys.map(({ key, name, icon }) => ({ + keys: { key: string; name?: string; icon?: string; state?: string }[], + ): { key: string; name: string; icon: string; state: string }[] => { + return keys.map(({ key, name, icon, state }) => ({ key, name: name ?? this.sensorDevices[key]?.original_name, icon: icon ?? this.getEntityAttribute(this.sensorDevices[key]?.entity_id, 'icon'), + state: state ?? this.getEntityState(this.sensorDevices[key]?.entity_id), })); }; @@ -662,7 +663,11 @@ export class VehicleCard extends LitElement { { key: 'odometer' }, { key: 'fuelLevel' }, { key: 'rangeLiquid' }, - { key: 'soc' }, + { + key: 'soc', + name: 'State of charger', + state: this.getEntityAttribute(this.sensorDevices.rangeElectric?.entity_id, 'soc'), + }, { key: 'maxSoc' }, { key: 'rangeElectric' }, ]; @@ -969,7 +974,7 @@ export class VehicleCard extends LitElement { hollow: { margin: 5, size: '40%', - background: 'transparent', + background: '#ffffff', image: undefined, }, dataLabels: {