iobroker.zigbee2mqtt 3.1.1 → 3.2.0

package/lib/states.js

@@ -1,4 +1,3 @@
-
 'use strict';
 
 /*eslint no-unused-vars: ['off']*/
@@ -109,8 +108,6 @@ const states = {
         },
     },
 
-
-
     simulated_brightness: {
         id: 'simulated_brightness',
         prop: 'brightness',
@@ -122,13 +119,17 @@ const states = {
         type: 'number',
         def: 0,
         unit: '%',
+        // Fix: null-Guard – bulbLevelToAdapterLevel(undefined) würde 0 liefern (Lampe scheinbar aus)
         getter: (payload) => {
+            if (payload.brightness == null) { return undefined; }
             return utils.bulbLevelToAdapterLevel(payload.brightness);
         },
     },
 
+    // Fix: prop ergänzt – statesController sucht zuerst per state.prop === payload-key
     state: {
         id: 'state',
+        prop: 'state',
         name: 'Switch state',
         icon: undefined,
         role: 'switch',
@@ -142,6 +143,7 @@ const states = {
 
     brightness: {
         id: 'brightness',
+        prop: 'brightness',
         name: 'Brightness',
         options: ['transition'],
         icon: undefined,
@@ -149,16 +151,16 @@ const states = {
         write: true,
         read: true,
         type: 'number',
+        def: 100,
         unit: '%',
         min: 0,
         max: 100,
-        def: 100,
+        // Fix: null-Guard – payload ohne brightness-Key liefert sonst fälschlich 0
         getter: (payload) => {
+            if (payload.brightness == null) { return undefined; }
             return utils.bulbLevelToAdapterLevel(payload.brightness);
         },
-        setter: (value) => {
-            return utils.adapterLevelToBulbLevel(value);
-        },
+        setter: (value) => utils.adapterLevelToBulbLevel(value),
     },
 
     brightness_move: {
@@ -170,9 +172,9 @@ const states = {
         write: true,
         read: false,
         type: 'number',
+        def: 0,
         min: -50,
         max: 50,
-        def: 0,
     },
 
     colortemp_move: {
@@ -184,9 +186,9 @@ const states = {
         write: true,
         read: false,
         type: 'number',
+        def: 0,
         min: -50,
         max: 50,
-        def: 0,
     },
 
     transition: {
@@ -198,12 +200,13 @@ const states = {
         write: true,
         read: false,
         type: 'number',
+        def: -1,
         unit: 'sec',
         min: -1,
         max: 65535,
-        def: -1,
         isOption: true,
     },
+
     send_payload: {
         id: 'send_payload',
         name: 'Send a raw json payload',
@@ -214,39 +217,49 @@ const states = {
         type: 'string',
         def: '{}',
     },
+
+    // Fix: prop ergänzt – Z2M sendet payload.voltage
     voltage: {
         id: 'voltage',
+        prop: 'voltage',
         name: 'Voltage',
         icon: undefined,
         role: 'value.voltage',
         write: false,
         read: true,
         type: 'number',
-        unit: 'V',
         def: 0,
+        unit: 'V',
     },
+
+    // Fix: prop ergänzt – Z2M sendet payload.voltage (Battery-Variante)
     battery_voltage: {
         id: 'voltage',
+        prop: 'voltage',
         name: 'Battery voltage',
         icon: undefined,
         role: 'battery.voltage',
         write: false,
         read: true,
         type: 'number',
-        unit: 'V',
         def: 0,
+        unit: 'V',
     },
+
+    // Fix: prop ergänzt – Z2M sendet payload.energy
     energy: {
         id: 'energy',
+        prop: 'energy',
         name: 'Sum of consumed energy',
         icon: undefined,
         role: 'value.power.consumption',
         write: false,
         read: true,
         type: 'number',
-        unit: 'kWh',
         def: 0,
+        unit: 'kWh',
     },
+
     battery: {
         id: 'battery',
         prop: 'battery',
@@ -256,35 +269,43 @@ const states = {
         write: false,
         read: true,
         type: 'number',
+        def: 0,
         unit: '%',
         min: 0,
         max: 100,
-        def: 0,
     },
+
+    // Fix: prop ergänzt – Z2M sendet payload.device_temperature
     device_temperature: {
         id: 'device_temperature',
+        prop: 'device_temperature',
         name: 'Temperature of the device',
         icon: undefined,
         role: 'value.temperature',
         write: false,
         read: true,
         type: 'number',
-        unit: '°C',
         def: 0,
+        unit: '°C',
     },
+
+    // Fix: prop ergänzt – Z2M sendet payload.temperature
     temperature: {
         id: 'temperature',
+        prop: 'temperature',
         name: 'Temperature',
         icon: undefined,
         role: 'value.temperature',
         write: false,
         read: true,
         type: 'number',
-        unit: '°C',
         def: 0,
+        unit: '°C',
     },
+
     humidity: {
         id: 'humidity',
+        prop: 'humidity',
         name: 'Humidity',
         icon: undefined,
         role: 'value.humidity',
@@ -296,8 +317,10 @@ const states = {
         min: 0,
         max: 100,
     },
+
     pressure: {
         id: 'pressure',
+        prop: 'pressure',
         name: 'Pressure',
         icon: undefined,
         role: 'value.pressure',
@@ -309,6 +332,7 @@ const states = {
         min: 0,
         max: 10000,
     },
+
     illuminance: {
         id: 'illuminance',
         prop: 'illuminance_lux',
@@ -321,6 +345,32 @@ const states = {
         def: 0,
         unit: 'lux',
     },
+
+    /**
+     * Illuminance berechnet aus dem Z2M-Rohwert (prop='illuminance').
+     * Formel: lux = round(10^(raw / 10000))
+     * Wird zusätzlich zu illuminance_raw angelegt wenn das Gerät keinen
+     * illuminance_lux-Expose liefert.
+     */
+    illuminance_from_raw: {
+        id: 'illuminance',
+        prop: 'illuminance',
+        name: 'Illuminance',
+        icon: undefined,
+        role: 'value.brightness',
+        write: false,
+        read: true,
+        type: 'number',
+        def: 0,
+        unit: 'lux',
+        getter: (payload) => {
+            if (payload.illuminance == null) { return undefined; }
+            const raw = payload.illuminance;
+            if (raw <= 0) { return 0; }
+            return Math.round(Math.pow(10, (raw - 1) / 10000));
+        },
+    },
+
     illuminance_raw: {
         id: 'illuminance_raw',
         prop: 'illuminance',
@@ -333,8 +383,53 @@ const states = {
         def: 0,
         unit: '',
     },
+
+    /**
+     * Rohwert-State wenn das Gerät 'illuminance_raw' als payload-Schlüssel sendet
+     * (z.B. Geräte mit eigenem illuminance_raw-Expose).
+     */
+    illuminance_raw_direct: {
+        id: 'illuminance_raw',
+        prop: 'illuminance_raw',
+        name: 'Illuminance raw',
+        icon: undefined,
+        role: 'value.brightness',
+        write: false,
+        read: true,
+        type: 'number',
+        def: 0,
+        unit: '',
+    },
+
+    /**
+     * Illuminance in Lux berechnet aus payload.illuminance_raw.
+     * Formel: lux = round(10^(illuminance_raw / 10000))
+     * Wird angelegt wenn das Gerät 'illuminance_raw' als Expose-Typ hat,
+     * aber kein separates 'illuminance_lux' liefert.
+     */
+    illuminance_from_illuminance_raw: {
+        id: 'illuminance',
+        prop: 'illuminance_raw',
+        name: 'Illuminance',
+        icon: undefined,
+        role: 'value.brightness',
+        write: false,
+        read: true,
+        type: 'number',
+        def: 0,
+        unit: 'lux',
+        getter: (payload) => {
+            if (payload.illuminance_raw == null) { return undefined; }
+            const raw = payload.illuminance_raw;
+            if (raw <= 0) { return 0; }
+            return Math.round(Math.pow(10, (raw - 1) / 10000));
+        },
+    },
+
+    // Fix: prop ergänzt – Z2M sendet payload.occupancy
     occupancy: {
         id: 'occupancy',
+        prop: 'occupancy',
         name: 'Occupancy',
         icon: undefined,
         role: 'sensor.motion',
@@ -343,6 +438,7 @@ const states = {
         type: 'boolean',
         def: false,
     },
+
     contact: {
         id: 'contact',
         prop: 'contact',
@@ -354,6 +450,7 @@ const states = {
         type: 'boolean',
         def: false,
     },
+
     opened: {
         id: 'opened',
         prop: 'contact',
@@ -364,8 +461,13 @@ const states = {
         read: true,
         type: 'boolean',
         def: false,
-        getter: (payload) => !payload.contact,
+        // Fix: null-Guard – !undefined wäre true (Tür fälschlich offen)
+        getter: (payload) => {
+            if (payload.contact == null) { return undefined; }
+            return !payload.contact;
+        },
     },
+
     tamper: {
         id: 'tampered',
         prop: 'tamper',
@@ -375,7 +477,9 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
+        def: false,
     },
+
     water_leak: {
         id: 'detected',
         prop: 'water_leak',
@@ -387,6 +491,7 @@ const states = {
         type: 'boolean',
         def: false,
     },
+
     batt_low_t_f: {
         id: 'battery_low',
         prop: 'battery_low',
@@ -398,6 +503,7 @@ const states = {
         type: 'boolean',
         def: false,
     },
+
     load_power: {
         id: 'load_power',
         prop: 'power',
@@ -420,11 +526,10 @@ const states = {
         write: false,
         read: true,
         type: 'number',
-        unit: 'A',
         def: 0,
+        unit: 'A',
     },
 
-
     temp_calibration: {
         id: 'temperature_calibration',
         prop: 'temperature_calibration',
@@ -438,6 +543,7 @@ const states = {
         unit: '°C',
         isOption: true,
     },
+
     local_temperature: {
         id: 'local_temperature',
         prop: 'local_temperature',
@@ -450,6 +556,7 @@ const states = {
         def: 0,
         unit: '°C',
     },
+
     local_temperature_calibration: {
         id: 'local_temperature_calibration',
         prop: 'local_temperature_calibration',
@@ -463,7 +570,6 @@ const states = {
         unit: '°C',
     },
 
-
     climate_away_mode: {
         id: 'away_mode',
         prop: 'away_mode',
@@ -473,34 +579,41 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
+        def: false,
         isEvent: true,
-        getter: (payload) => (payload.action === 'ON' ? true : false),
+        getter: (payload) => payload.away_mode === 'ON',
         setter: (value) => (value ? 'ON' : 'OFF'),
     },
+
+    // Fix: def ergänzt – ioBroker meldet Fehler beim Anlegen ohne def bei type:'string'
     climate_system_mode: {
         id: 'mode',
-        name: 'Mode',
         prop: 'system_mode',
+        name: 'Mode',
         icon: undefined,
         role: 'state',
         write: true,
         read: true,
         type: 'string',
+        def: '',
         states: { auto: 'auto', off: 'off', heat: 'heat' },
     },
+
+    // Fix: write:false – running_state ist ein reiner Sensor-State (Z2M sendet nur, setzt nie)
+    // Fix: def ergänzt
     climate_running_mode: {
         id: 'running_state',
-        name: 'Running Mode',
         prop: 'running_state',
+        name: 'Running Mode',
         icon: undefined,
         role: 'state',
-        write: true,
+        write: false,
         read: true,
-        type: 'string', // valid: low, medium, high
+        type: 'string',
+        def: '',
         states: { idle: 'idle', heat: 'heat' },
     },
 
-
     brightness_step: {
         id: 'brightness_step',
         prop: 'brightness_step',
@@ -514,6 +627,7 @@ const states = {
         min: -50,
         max: 50,
     },
+
     hue_move: {
         id: 'hue_move',
         prop: 'hue_move',
@@ -523,15 +637,15 @@ const states = {
         write: true,
         read: false,
         type: 'number',
+        def: 0,
         min: -50,
         max: 50,
-        def: 0,
     },
 
     child_lock: {
         id: 'lock',
-        name: 'Locked',
         prop: 'child_lock',
+        name: 'Locked',
         icon: undefined,
         role: 'state',
         write: true,