Add default entities names

futurehome/CHANGELOG.md

@@ -5,6 +5,7 @@
 
 - Added support for 'chargepoint' service (EV chargers).
 - Updated demo mode data to add thermostat with dual setpoint system (heat+cool).
+- Added default entities names.
 
 ## 0.1.2 (24.07.2025)
 

futurehome/src/services/barrier_ctrl.ts

@@ -41,6 +41,7 @@ export function barrier_ctrl__components(
   } else {
     deviceClass = null;
   }
+  const name = deviceClass ? undefined : 'Barrier';
 
   // Check if position control is supported
   const supportsPosition = svc.props?.sup_tposition === true;
@@ -50,6 +51,7 @@ export function barrier_ctrl__components(
     unique_id: svc.addr,
     platform: 'cover',
     device_class: deviceClass,
+    name: name,
     command_topic: commandTopic,
     optimistic: false,
     value_template: `{{ value_json['${svc.addr}'].state }}`,

futurehome/src/services/basic.ts

@@ -16,7 +16,7 @@ import { ServiceComponentsCreationResult } from '../ha/publish_device';
 
 export function basic__components(
   topicPrefix: string,
-  _device: VinculumPd7Device,
+  device: VinculumPd7Device,
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   // MQTT topic that HA will publish commands to
@@ -31,6 +31,7 @@ export function basic__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'number',
+        name: device.client?.name ?? device?.modelAlias,
         min: MIN_LVL,
         max: MAX_LVL,
         step: 1,

futurehome/src/services/color_ctrl.ts

@@ -58,6 +58,7 @@ export function color_ctrl__components(
   const lightComponent: LightComponent = {
     unique_id: svc.addr,
     platform: 'light',
+    name: 'Light',
 
     // Basic on/off control
     command_topic: commandTopic,

futurehome/src/services/fan_ctrl.ts

@@ -21,6 +21,7 @@ export function fan_ctrl__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'fan',
+        name: 'Fan',
         command_topic: commandTopic,
         optimistic: false,
         preset_modes: supModes,

futurehome/src/services/out_bin_switch.ts

@@ -17,6 +17,7 @@ export function out_bin_switch__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'switch',
+        name: 'Binary Switch',
         command_topic: commandTopic,
         optimistic: false,
         value_template: `{{ (value_json['${svc.addr}'].binary) | iif('ON', 'OFF') }}`,

futurehome/src/services/out_lvl_switch.ts

@@ -20,6 +20,7 @@ export function out_lvl_switch__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'number',
+        name: 'Level Switch',
         min: minLvl,
         max: maxLvl,
         step: 1,

futurehome/src/services/scene_ctrl.ts

@@ -35,20 +35,12 @@ export function scene_ctrl__components(
     components[`${svc.addr}_scene`] = {
       unique_id: `${svc.addr}_scene`,
       platform: 'sensor',
+      name: 'Scene',
       unit_of_measurement: '',
       value_template: `{{ value_json['${svc.addr}'].scene }}`,
     };
   }
 
-  if (svc.intf?.includes('evt.lvl.report')) {
-    components[`${svc.addr}_lvl`] = {
-      unique_id: `${svc.addr}_lvl`,
-      platform: 'sensor',
-      unit_of_measurement: '',
-      value_template: `{{ value_json['${svc.addr}'].lvl }}`,
-    };
-  }
-
   // ───────────── writeable “select” (scene activator) ─────────────
   const supScenes: string[] = svc.props?.sup_scenes ?? [];
   if (svc.intf?.includes('cmd.scene.set') && supScenes.length) {
@@ -57,6 +49,7 @@ export function scene_ctrl__components(
     components[`${svc.addr}_select`] = {
       unique_id: `${svc.addr}_select`,
       platform: 'select',
+      name: 'Scene',
       options: supScenes,
       command_topic: commandTopic,
       optimistic: false,

futurehome/src/services/sensor_accelx.ts

@@ -10,6 +10,7 @@ export function sensor_accelx__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Acceleration, X-axis';
   const unit = svc.props?.sup_units?.[0] ?? 'm/s2';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_accelx__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_accely.ts

@@ -10,6 +10,7 @@ export function sensor_accely__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Acceleration, Y-axis';
   const unit = svc.props?.sup_units?.[0] ?? 'm/s2';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_accely__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_accelz.ts

@@ -10,6 +10,7 @@ export function sensor_accelz__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Acceleration, Z-axis';
   const unit = svc.props?.sup_units?.[0] ?? 'm/s2';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_accelz__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_airflow.ts

@@ -10,6 +10,7 @@ export function sensor_airflow__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Air flow';
   const unit = svc.props?.sup_units?.[0] ?? 'm3/h';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_airflow__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_airq.ts

@@ -10,6 +10,7 @@ export function sensor_airq__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'aqi';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'pm25';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_airq__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_anglepos.ts

@@ -10,14 +10,18 @@ export function sensor_anglepos__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Angle Position';
   const unit = svc.props?.sup_units?.[0] ?? '%';
+  const state_class = svc.props?.sup_units?.[0] === '%' ? 'measurement' : 'measurement_angle';
 
   return {
     components: {
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
+        state_class: state_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,
       },

futurehome/src/services/sensor_atmo.ts

@@ -10,6 +10,7 @@ export function sensor_atmo__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'atmospheric_pressure';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'kPa';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_atmo__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_baro.ts

@@ -10,6 +10,7 @@ export function sensor_baro__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'atmospheric_pressure';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'kPa';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_baro__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_co.ts

@@ -10,6 +10,7 @@ export function sensor_co__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'carbon_monoxide';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'mol/m3';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_co__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_co2.ts

@@ -10,6 +10,7 @@ export function sensor_co2__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'carbon_dioxide';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'ppm';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_co2__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_current.ts

@@ -10,6 +10,7 @@ export function sensor_current__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'current';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'A';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_current__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_dew.ts

@@ -10,6 +10,7 @@ export function sensor_dew__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'temperature';
+  const name = undefined;
   let unit = svc.props?.sup_units?.[0] ?? '°C';
   if (unit === 'C') unit = '°C';
   if (unit === 'F') unit = '°F';
@@ -19,6 +20,7 @@ export function sensor_dew__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_direct.ts

@@ -10,6 +10,7 @@ export function sensor_direct__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'wind_direction';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? '°';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_direct__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_distance.ts

@@ -10,6 +10,7 @@ export function sensor_distance__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'distance';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'm';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_distance__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_elresist.ts

@@ -10,6 +10,7 @@ export function sensor_elresist__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Electrical resistivity';
   const unit = svc.props?.sup_units?.[0] ?? 'ohm/m';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_elresist__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_freq.ts

@@ -10,6 +10,7 @@ export function sensor_freq__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'frequency';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'Hz';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_freq__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_gp.ts

@@ -10,6 +10,7 @@ export function sensor_gp__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Sensor';
   const unit = svc.props?.sup_units?.[0] ?? '%';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_gp__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_gust.ts

@@ -10,6 +10,7 @@ export function sensor_gust__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Gust';
   let unit = svc.props?.sup_units?.[0] ?? 'km/h';
   if (unit === 'kph') unit = 'km/h';
 
@@ -18,6 +19,7 @@ export function sensor_gust__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_humid.ts

@@ -10,6 +10,7 @@ export function sensor_humid__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'humidity';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? '%';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_humid__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_lumin.ts

@@ -10,6 +10,7 @@ export function sensor_lumin__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'illuminance';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'lx';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_lumin__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_moist.ts

@@ -10,6 +10,7 @@ export function sensor_moist__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'moisture';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? '%';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_moist__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_noise.ts

@@ -10,6 +10,7 @@ export function sensor_noise__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'sound_pressure';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'dB';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_noise__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_power.ts

@@ -10,6 +10,7 @@ export function sensor_power__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'power';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'W';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_power__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_rain.ts

@@ -10,6 +10,7 @@ export function sensor_rain__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'precipitation_intensity';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'mm/h';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_rain__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_rotation.ts

@@ -10,6 +10,7 @@ export function sensor_rotation__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Rotation';
   const unit = svc.props?.sup_units?.[0] ?? 'rpm';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_rotation__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_seismicint.ts

@@ -10,6 +10,7 @@ export function sensor_seismicint__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Seismic intensity';
   const unit = svc.props?.sup_units?.[0] ?? 'EMCRO';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_seismicint__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_seismicmag.ts

@@ -10,6 +10,7 @@ export function sensor_seismicmag__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Seismic magnitude';
   const unit = svc.props?.sup_units?.[0] ?? 'MB';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_seismicmag__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_solarrad.ts

@@ -10,6 +10,7 @@ export function sensor_solarrad__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Solar radiation';
   const unit = svc.props?.sup_units?.[0] ?? 'W/m2';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_solarrad__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_tank.ts

@@ -10,6 +10,7 @@ export function sensor_tank__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'volume_storage';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'l';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_tank__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_temp.ts

@@ -10,6 +10,7 @@ export function sensor_temp__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'temperature';
+  const name = undefined;
   let unit = svc.props?.sup_units?.[0] ?? '°C';
   if (unit === 'C') unit = '°C';
   if (unit === 'F') unit = '°F';
@@ -19,6 +20,7 @@ export function sensor_temp__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_tidelvl.ts

@@ -10,6 +10,7 @@ export function sensor_tidelvl__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Tide level';
   const unit = svc.props?.sup_units?.[0] ?? 'm';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_tidelvl__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_uv.ts

@@ -10,6 +10,7 @@ export function sensor_uv__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Ultraviolet';
   const unit = svc.props?.sup_units?.[0] ?? 'index';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_uv__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_veloc.ts

@@ -10,6 +10,7 @@ export function sensor_veloc__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = undefined;
+  const name = 'Velocity';
   const unit = svc.props?.sup_units?.[0] ?? 'm/2';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_veloc__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_voltage.ts

@@ -10,6 +10,7 @@ export function sensor_voltage__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'voltage';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'V';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_voltage__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_watflow.ts

@@ -10,6 +10,7 @@ export function sensor_watflow__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'volume_flow_rate';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'l/h';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_watflow__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_watpressure.ts

@@ -10,6 +10,7 @@ export function sensor_watpressure__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'pressure';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'kPa';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_watpressure__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_wattemp.ts

@@ -10,6 +10,7 @@ export function sensor_wattemp__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'temperature';
+  const name = undefined;
   let unit = svc.props?.sup_units?.[0] ?? '°C';
   if (unit === 'C') unit = '°C';
   if (unit === 'F') unit = '°F';
@@ -19,6 +20,7 @@ export function sensor_wattemp__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_weight.ts

@@ -10,6 +10,7 @@ export function sensor_weight__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'weight';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'kg';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_weight__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/sensor_wind.ts

@@ -10,6 +10,7 @@ export function sensor_wind__components(
   svc: VinculumPd7Service,
 ): ServiceComponentsCreationResult | undefined {
   const device_class = 'wind_speed';
+  const name = undefined;
   const unit = svc.props?.sup_units?.[0] ?? 'km/h';
 
   return {
@@ -17,6 +18,7 @@ export function sensor_wind__components(
       [svc.addr]: {
         unique_id: svc.addr,
         platform: 'sensor',
+        name: name,
         device_class: device_class,
         unit_of_measurement: unit,
         value_template: `{{ value_json['${svc.addr}'].sensor }}`,

futurehome/src/services/thermostat.ts

@@ -119,6 +119,7 @@ export function thermostat__components(
   const climateComponent: ClimateComponent = {
     unique_id: svc.addr,
     platform: 'climate',
+    name: 'Thermostat',
     modes: haModes,
     mode_command_topic: modeCommandTopic,
     // mode_state_topic seems to be required for mode state to be reported correctly in HA

futurehome/src/services/water_heater.ts

@@ -96,6 +96,7 @@ export function water_heater__components(
   const waterHeaterComponent: HaMqttComponent = {
     unique_id: svc.addr,
     platform: 'water_heater',
+    name: 'Water heater',
     modes: haModes.length > 0 ? haModes : ['off', 'heat_pump'],
     mode_command_topic: modeCommandTopic,
     mode_state_topic: stateTopic,