Fix invalid device_class + unit_of_measurement combinations for HA 2026.5

HA 2026.5 enforces strict validation of device_class/unit_of_measurement
pairs in MQTT discovery payloads. Four categories were broken:

- power_factor: unit was sent as "power_factor" (the FIMP field name); HA
  requires the field to be omitted or empty for this device class. Fixed by
  normalising the display unit separately from the FIMP data-path key.

- illuminance: unit "Lux" is rejected; normalise to "lx". When a sensor
  reports luminance as "%" (some Z-Wave devices), the illuminance device
  class is dropped so the entity becomes a generic sensor rather than
  triggering a validation error.

- reactive_power (regular/export meter): unit "VAr" is rejected; HA requires
  lowercase "var".

- reactive_power (extended meter values, e.g. p_import_react): the unit
  determination logic fell through to the generic power branch and sent "W";
  reactive power extended values now emit "var", apparent power values emit
  "VA", and reactive energy values emit "kvarh".

Fixes #31

futurehome/CHANGELOG.md

@@ -1,5 +1,17 @@
 <!-- https://developers.home-assistant.io/docs/add-ons/presentation#keeping-a-changelog -->
 
+## 1.6.1 (16.10.2025)
+
+- Tweaked 'Ignore Availability Reports' setting.
+
+## 1.6.0 (16.10.2025)
+
+- Added setting to always treat all devices as up.
+
+## 1.5.0 (16.10.2025)
+
+- Reverted: Add ability to specify a custom MQTT broker.
+
 ## 1.4.0 (13.10.2025)
 
 - Added ability to specify a custom MQTT broker.

futurehome/config.yaml

@@ -1,6 +1,6 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 name: Futurehome
-version: '1.4.0'
+version: '1.6.1'
 slug: futurehome
 description: Local Futurehome Smarthub integration
 url: 'https://github.com/adrianjagielak/home-assistant-futurehome'
@@ -22,6 +22,7 @@ options:
   tp_username: ''
   tp_password: ''
   tp_allow_empty: false
+  ignore_availability_reports: false
   demo_mode: false
   show_debug_log: false
 
@@ -32,10 +33,7 @@ schema:
   tp_username: 'str?'
   tp_password: 'password?'
   tp_allow_empty: 'bool?'
-  custom_mqtt_host: 'str?'
-  custom_mqtt_port: 'int?'
-  custom_mqtt_user: 'str?'
-  custom_mqtt_pwd: 'password?'
+  ignore_availability_reports: 'bool?'
   demo_mode: 'bool?'
   show_debug_log: 'bool?'
 

futurehome/rootfs/etc/services.d/futurehome/run

@@ -11,10 +11,7 @@ export FH_PASSWORD=$(bashio::config 'fh_password')
 export TP_USERNAME=$(bashio::config 'tp_username')
 export TP_PASSWORD=$(bashio::config 'tp_password')
 export TP_ALLOW_EMPTY=$(bashio::config 'tp_allow_empty')
-export CUSTOM_MQTT_HOST=$(bashio::config 'custom_mqtt_host')
-export CUSTOM_MQTT_PORT=$(bashio::config 'custom_mqtt_port')
-export CUSTOM_MQTT_USER=$(bashio::config 'custom_mqtt_user')
-export CUSTOM_MQTT_PWD=$(bashio::config 'custom_mqtt_pwd')
+export IGNORE_AVAILABILITY_REPORTS=$(bashio::config 'ignore_availability_reports')
 export DEMO_MODE=$(bashio::config 'demo_mode')
 export SHOW_DEBUG_LOG=$(bashio::config 'show_debug_log')
 

futurehome/src/index.ts

@@ -25,19 +25,20 @@ import { pollVinculum } from './fimp/vinculum';
   const thingsplexAllowEmpty = (process.env.TP_ALLOW_EMPTY || '')
     .toLowerCase()
     .includes('true');
+  const ignoreAvailabilityReports = (
+    process.env.IGNORE_AVAILABILITY_REPORTS || ''
+  )
+    .toLowerCase()
+    .includes('true');
   const demoMode = (process.env.DEMO_MODE || '').toLowerCase().includes('true');
   const showDebugLog = (process.env.SHOW_DEBUG_LOG || '')
     .toLowerCase()
     .includes('true');
 
-  const mqttHost = process.env.CUSTOM_MQTT_HOST || process.env.MQTT_HOST || '';
-  const mqttPort = Number(
-    process.env.CUSTOM_MQTT_PORT || process.env.MQTT_PORT || '1883',
-  );
-  const mqttUsername =
-    process.env.CUSTOM_MQTT_USER || process.env.MQTT_USER || '';
-  const mqttPassword =
-    process.env.CUSTOM_MQTT_PWD || process.env.MQTT_PWD || '';
+  const mqttHost = process.env.MQTT_HOST || '';
+  const mqttPort = Number(process.env.MQTT_PORT || '1883');
+  const mqttUsername = process.env.MQTT_USER || '';
+  const mqttPassword = process.env.MQTT_PWD || '';
 
   setupLogger({ showDebugLog });
 
@@ -273,6 +274,9 @@ import { pollVinculum } from './fimp/vinculum';
             return;
           }
           for (const deviceAvailability of devicesAvailability) {
+            if (ignoreAvailabilityReports) {
+              deviceAvailability.status = 'UP';
+            }
             haUpdateAvailability({ hubId, deviceAvailability });
             await delay(50);
           }

futurehome/src/services/_meter.ts

@@ -370,16 +370,25 @@ export function _meter__components(
           break;
       }
 
+      // Map FIMP unit names to HA-compatible unit_of_measurement values
+      const haUnit =
+        unit === 'power_factor' ? '' :
+        unit === 'VAr' ? 'var' :
+        unit === 'kVArh' ? 'kvarh' : unit;
+
       const component: SensorComponent = {
         unique_id: componentId,
         platform: 'sensor',
         entity_category: 'diagnostic',
         name: friendlyName,
-        unit_of_measurement: unit,
         state_class: stateClass,
         value_template: `{{ value_json['${svc.addr}'].meter.${unit}.val | default(0) }}`,
       };
 
+      if (haUnit) {
+        component.unit_of_measurement = haUnit;
+      }
+
       if (deviceClass) {
         component.device_class = deviceClass;
       }
@@ -460,16 +469,24 @@ export function _meter__components(
           break;
       }
 
+      // Map FIMP unit names to HA-compatible unit_of_measurement values
+      const haUnit =
+        unit === 'VAr' ? 'var' :
+        unit === 'kVArh' ? 'kvarh' : unit;
+
       const component: SensorComponent = {
         unique_id: componentId,
         platform: 'sensor',
         entity_category: 'diagnostic',
         name: friendlyName,
-        unit_of_measurement: unit,
         state_class: stateClass,
         value_template: `{{ value_json['${svc.addr}'].meter_export.${unit}.val | default(0) }}`,
       };
 
+      if (haUnit) {
+        component.unit_of_measurement = haUnit;
+      }
+
       if (deviceClass) {
         component.device_class = deviceClass;
       }
@@ -510,14 +527,25 @@ export function _meter__components(
 
       // Determine unit based on value name
       let unit = '';
-      if (
+      const isPhasePower =
         valueName.startsWith('p_') ||
         valueName.startsWith('p1') ||
         valueName.startsWith('p2') ||
-        valueName.startsWith('p3') ||
-        valueName === 'dc_p'
-      ) {
+        valueName.startsWith('p3');
+      if (isPhasePower && valueName.includes('_react')) {
+        unit = 'var';
+      } else if (isPhasePower && valueName.includes('_apparent')) {
+        unit = 'VA';
+      } else if (isPhasePower || valueName === 'dc_p') {
         unit = 'W';
+      } else if (
+        (valueName.startsWith('e_') ||
+          valueName.startsWith('e1') ||
+          valueName.startsWith('e2') ||
+          valueName.startsWith('e3')) &&
+        valueName.includes('_react')
+      ) {
+        unit = 'kvarh';
       } else if (
         valueName.startsWith('e_') ||
         valueName.startsWith('e1') ||
@@ -565,9 +593,9 @@ export function _meter__components(
       }
 
       // Set suggested display precision
-      if (unit === 'kWh') {
+      if (unit === 'kWh' || unit === 'kvarh') {
         component.suggested_display_precision = 3;
-      } else if (unit === 'W' || unit === 'V' || unit === 'A') {
+      } else if (unit === 'W' || unit === 'V' || unit === 'A' || unit === 'var' || unit === 'VA') {
         component.suggested_display_precision = 1;
       } else if (unit === 'Hz') {
         component.suggested_display_precision = 2;

futurehome/src/services/_sensor_numeric.ts

@@ -72,12 +72,15 @@ export function _sensor_numeric__components(
 
   if (!data) return undefined;
 
-  const device_class = data[0];
+  let device_class = data[0];
   const name = data[1];
   let unit = svc.props?.sup_units?.[0] ?? data[2];
   if (unit === 'C') unit = '°C';
   if (unit === 'F') unit = '°F';
   if (unit === 'kph') unit = 'km/h';
+  if (unit === 'Lux') unit = 'lx';
+  // HA rejects illuminance + %; drop device_class for percentage-reporting sensors
+  if (device_class === 'illuminance' && unit === '%') device_class = undefined;
   const state_class = data[3];
 
   return {

futurehome/translations/en.yaml

@@ -17,18 +17,9 @@ configuration:
   tp_allow_empty:
     name: Allow Empty Thingsplex Credentials
     description: Allow empty Thingsplex username and/or password.
-  custom_mqtt_host:
-    name: Custom MQTT Host (Optional)
-    description: Your custom MQTT broker host.
-  custom_mqtt_port:
-    name: Custom MQTT Port (Optional)
-    description: Your custom MQTT broker port.
-  custom_mqtt_user:
-    name: Custom MQTT Username (Optional)
-    description: Your custom MQTT broker username.
-  custom_mqtt_pwd:
-    name: Custom MQTT Password (Optional)
-    description: Your custom MQTT broker password.
+  ignore_availability_reports:
+    name: Ignore Availability Reports
+    description: Sometimes the hub incorrectly reports some devices as down. This setting forces all devices to always be treated as up.
   demo_mode:
     name: Demo Mode
     description: Use a sample recorded state from a real Futurehome Smarthub to simulate devices.