combined device entities

src/components/map-card.js

@@ -284,7 +284,6 @@ export class VehicleMap extends LitElement {
         throw new Error('Failed to fetch address');
       }
     } catch (error) {
-      console.error('Error fetching address:', error);
       return null;
     }
   }

src/const.ts

@@ -75,3 +75,10 @@ export const lockStateMapping = {
   '3': 'Partly unlocked',
   '4': 'Unknown',
 };
+
+export const selectedProgramMapping = {
+  '0': 'Standard',
+  '1': 'Unknown',
+  '2': 'Home',
+  '3': 'Work',
+};

src/types.ts

@@ -1,10 +1,14 @@
 import { ActionConfig, LovelaceCard, LovelaceCardConfig, LovelaceCardEditor, Themes } from 'custom-card-helpers';
 
+import { VehicleCard } from './vehicle-info-card';
 declare global {
   interface HTMLElementTagNameMap {
     'vehicle-info-card-editor': LovelaceCardEditor;
     'hui-error-card': LovelaceCard;
   }
+  interface Window {
+    BenzCard: VehicleCard | undefined;
+  }
 }
 /**
  * ExtendedThemes extends the existing Themes interface with additional properties.
@@ -55,31 +59,43 @@ export const defaultConfig: Partial<VehicleCardConfig> = {
   tyre_card: [],
 };
 
-export interface SensorDevice {
+export interface VehicleEntity {
   entity_id: string;
   original_name: string;
   device_id: string;
 }
 
-export interface BinarySensorDevice {
+export interface VehicleEntities {
+  [key: string]: VehicleEntity;
+}
+
+export interface VehicleEntity {
   entity_id: string;
   original_name: string;
   device_id: string;
 }
 
-export interface SensorDevices {
-  [key: string]: SensorDevice;
-}
+export type EntityAttr = {
+  key: string;
+  name: string;
+  icon: string;
+  unit: string;
+  state: string;
+};
 
-export interface BinarySensors {
-  [key: string]: BinarySensorDevice;
+export interface EntityConfig {
+  key: string;
+  name?: string;
+  icon?: string;
+  unit?: string;
+  state?: string;
 }
 
 /**
  * Filters for binary sensors.
  */
 export const binarySensorsFilters: {
-  [name in keyof Partial<BinarySensors>]: { prefix?: string; suffix: string };
+  [key: string]: { prefix?: string; suffix: string };
 } = {
   lock: { prefix: 'lock', suffix: '_lock' },
   parkBrake: { suffix: '_parkbrakestatus' },
@@ -99,9 +115,9 @@ export const binarySensorsFilters: {
  * Filters for sensor devices.
  */
 export const sensorDeviceFilters: {
-  [name in keyof Partial<SensorDevices>]: { prefix?: string; suffix: string };
+  [key: string]: { prefix?: string; suffix: string };
 } = {
-  lock: { prefix: 'sensor.', suffix: '_lock' },
+  lockSensor: { prefix: 'sensor.', suffix: '_lock' },
   averageSpeedReset: { suffix: '_averagespeedreset' },
   averageSpeedStart: { suffix: '_averagespeedstart' },
   distanceReset: { suffix: '_distancereset' },
@@ -131,14 +147,7 @@ export const sensorDeviceFilters: {
   chargingPower: { suffix: '_chargingPower' },
 };
 
-/**
- * Interface entityConfig
- */
-
-export interface EntityConfig {
-  key: string;
-  name?: string;
-  icon?: string;
-  unit?: string;
-  state?: string;
-}
+export const combinedFilters: { [name in keyof Partial<VehicleEntities>]: { prefix?: string; suffix: string } } = {
+  ...binarySensorsFilters,
+  ...sensorDeviceFilters,
+};

src/utils/compute_object_id.ts

@@ -0,0 +1,3 @@
+/** Compute the object ID of a state. */
+export const computeObjectId = (entityId: string): string =>
+  entityId.substr(entityId.indexOf(".") + 1);

src/utils/compute_state_name.ts

@@ -0,0 +1,13 @@
+import { HassEntity } from "home-assistant-js-websocket";
+import { computeObjectId } from "./compute_object_id";
+
+export const computeStateNameFromEntityAttributes = (
+  entityId: string,
+  attributes: { [key: string]: any }
+): string =>
+  attributes.friendly_name === undefined
+    ? computeObjectId(entityId).replace(/_/g, " ")
+    : (attributes.friendly_name ?? "").toString();
+
+export const computeStateName = (stateObj: HassEntity): string =>
+  computeStateNameFromEntityAttributes(stateObj.entity_id, stateObj.attributes);

src/utils/utils.ts

@@ -1,20 +1,17 @@
 import { HomeAssistant } from 'custom-card-helpers';
-import { SensorDevice, BinarySensorDevice } from '../types';
+import { VehicleEntity } from '../types';
+import { combinedFilters } from '../types';
 
 /**
  *
- * @param hass
- * @param config
- * @param filters
+ * @param car
  * @returns
  */
-export async function getDeviceEntities(
+
+export async function getVehicleEntities(
   hass: HomeAssistant,
   config: { entity?: string },
-  filters: {
-    [key: string]: { prefix?: string; suffix: string };
-  },
-): Promise<{ [key: string]: SensorDevice | BinarySensorDevice }> {
+): Promise<{ [key: string]: VehicleEntity }> {
   const allEntities = await hass.callWS<
     { entity_id: string; device_id: string; original_name: string; unique_id: string }[]
   >({
@@ -27,10 +24,10 @@ export async function getDeviceEntities(
   }
 
   const deviceEntities = allEntities.filter((e) => e.device_id === carEntity.device_id);
-  const entityIds: { [key: string]: SensorDevice | BinarySensorDevice } = {};
+  const entityIds: { [key: string]: VehicleEntity } = {};
 
-  for (const entityName of Object.keys(filters)) {
-    const { prefix, suffix } = filters[entityName];
+  for (const entityName of Object.keys(combinedFilters)) {
+    const { prefix, suffix } = combinedFilters[entityName];
     if (!prefix) {
       const entity = deviceEntities.find((e) => e.unique_id.endsWith(suffix));
       if (entity) {