iobroker.zigbee2mqtt 3.0.21 → 3.1.5

package/lib/rgb.js

@@ -115,10 +115,15 @@ function cie_to_rgb(x, y, brightness) {
  * @returns {Array} Array that contains the CIE color values for x and y
  */
 function rgb_to_cie(red, green, blue) {
+    // Normalize RGB values from 0-255 to 0-1 before gamma correction
+    red   = red   / 255;
+    green = green / 255;
+    blue  = blue  / 255;
+
     // Apply a gamma correction to the RGB values, which makes the color more vivid and more the like the color displayed on the screen of your device
-    red = red > 0.04045 ? Math.pow((red + 0.055) / (1.0 + 0.055), 2.4) : red / 12.92;
+    red   = red   > 0.04045 ? Math.pow((red   + 0.055) / (1.0 + 0.055), 2.4) : red   / 12.92;
     green = green > 0.04045 ? Math.pow((green + 0.055) / (1.0 + 0.055), 2.4) : green / 12.92;
-    blue = blue > 0.04045 ? Math.pow((blue + 0.055) / (1.0 + 0.055), 2.4) : blue / 12.92;
+    blue  = blue  > 0.04045 ? Math.pow((blue  + 0.055) / (1.0 + 0.055), 2.4) : blue  / 12.92;
 
     // RGB values to XYZ using the Wide RGB D65 conversion formula
     const X = red * 0.664511 + green * 0.154324 + blue * 0.162028;
@@ -155,7 +160,9 @@ function hsvToRGB(h, s, v) {
     let g;
     let b;
     if (arguments.length === 1) {
-        (s = h.s), (v = h.v), (h = h.h);
+        s = h.s;
+        v = h.v;
+        h = h.h;
     }
     const i = Math.floor(h * 6);
     const f = h * 6 - i;
@@ -163,24 +170,13 @@ function hsvToRGB(h, s, v) {
     const q = v * (1 - f * s);
     const t = v * (1 - (1 - f) * s);
     switch (i % 6) {
-        case 0:
-            (r = v), (g = t), (b = p);
-            break;
-        case 1:
-            (r = q), (g = v), (b = p);
-            break;
-        case 2:
-            (r = p), (g = v), (b = t);
-            break;
-        case 3:
-            (r = p), (g = q), (b = v);
-            break;
-        case 4:
-            (r = t), (g = p), (b = v);
-            break;
-        case 5:
-            (r = v), (g = p), (b = q);
-            break;
+        case 0: r = v; g = t; b = p; break;
+        case 1: r = q; g = v; b = p; break;
+        case 2: r = p; g = v; b = t; break;
+        case 3: r = p; g = q; b = v; break;
+        case 4: r = t; g = p; b = v; break;
+        case 5: r = v; g = p; b = q; break;
+        default: r = 0; g = 0; b = 0; break;
     }
     return {
         r: Math.round(r * 255),
@@ -198,7 +194,9 @@ function hsvToRGB(h, s, v) {
  */
 function rgbToHSV(r, g, b, numeric) {
     if (arguments.length === 1) {
-        (g = r.g), (b = r.b), (r = r.r);
+        g = r.g;
+        b = r.b;
+        r = r.r;
     }
     const max = Math.max(r, g, b);
     const min = Math.min(r, g, b);
@@ -225,20 +223,18 @@ function rgbToHSV(r, g, b, numeric) {
             break;
     }
     if (numeric) {
-      return {
-
+        return {
             h: Math.round(h * 360),
             s: Math.round(s * 100),
             v: Math.round(v * 100),
         };
     }
-      return {
-    
+    return {
         h: (h * 360).toFixed(3),
         s: (s * 100).toFixed(3),
         v: (v * 100).toFixed(3),
-      };
-  }
+    };
+}
 
 /**
  *
@@ -281,20 +277,20 @@ function hsv_to_cie(h, s, v) {
 function rgb_to_rgbstring(element) {
     let col = '#';
     if (element && element.hasOwnProperty('r')) {
-col = col + element.r.toString(16).padStart(2, '0');
-} else {
-col = `${col  }00`;
-}
+        col += element.r.toString(16).padStart(2, '0');
+    } else {
+        col += '00';
+    }
     if (element && element.hasOwnProperty('g')) {
-col = col + element.g.toString(16).padStart(2, '0');
-} else {
-col = `${col  }00`;
-}
+        col += element.g.toString(16).padStart(2, '0');
+    } else {
+        col += '00';
+    }
     if (element && element.hasOwnProperty('b')) {
-col = col + element.b.toString(16).padStart(2, '0');
-} else {
-col = `${col  }00`;
-}
+        col += element.b.toString(16).padStart(2, '0');
+    } else {
+        col += '00';
+    }
     return col;
 }
 
@@ -306,30 +302,23 @@ col = `${col  }00`;
  */
 function hsbToRGB(h, s, b) {
     const br = Math.round(b * 2.55);
-    if (s == 0) {
+    if (s === 0) {
         return [br, br, br];
-    } 
-        const hue = h % 360;
-        const f = hue % 60;
-        const p = Math.round(b * (100 - s) * 0.0255);
-        const q = Math.round(b * (6000 - s * f) * 0.000425);
-        const t = Math.round(b * (6000 - s * (60 - f)) * 0.000425);
-        switch (Math.floor(hue / 60)) {
-            case 0:
-                return [br, t, p];
-            case 1:
-                return [q, br, p];
-            case 2:
-                return [p, br, t];
-            case 3:
-                return [p, q, br];
-            case 4:
-                return [t, p, br];
-            case 5:
-                return [br, p, q];
-        }
-    
-    return false;
+    }
+    const hue = h % 360;
+    const f = hue % 60;
+    const p = Math.round(b * (100 - s) * 0.0255);
+    const q = Math.round(b * (6000 - s * f) * 0.000425);
+    const t = Math.round(b * (6000 - s * (60 - f)) * 0.000425);
+    switch (Math.floor(hue / 60)) {
+        case 0: return [br, t, p];
+        case 1: return [q, br, p];
+        case 2: return [p, br, t];
+        case 3: return [p, q, br];
+        case 4: return [t, p, br];
+        case 5: return [br, p, q];
+    }
+    return [br, br, br]; // fallback – sollte nie erreicht werden
 }
 
 /**

package/lib/states.js

@@ -1,11 +1,8 @@
-
 'use strict';
 
 /*eslint no-unused-vars: ['off']*/
 
-const rgb = require('./rgb.js');
 const utils = require('./utils.js');
-const colors = require('./colors.js');
 
 /* states for device:
    id - sysname of state, id
@@ -58,8 +55,6 @@ const unitLookup = {
     illuminance_lux: 'lx',
 };
 
-const timers = {};
-
 const states = {
     link_quality: {
         id: 'link_quality',
@@ -98,12 +93,21 @@ const states = {
         type: 'string',
         def: '',
         getter: (payload) => {
-            return payload.last_seen.replace('T', ' ').split('+')[0];
+            const val = payload.last_seen;
+            if (val == null) {
+                return undefined;
+            }
+            // Z2M kann last_seen als Unix-Timestamp (number in ms) ODER als ISO-String senden
+            if (typeof val === 'number') {
+                return new Date(val).toISOString().replace('T', ' ').split('.')[0];
+            }
+            if (typeof val === 'string') {
+                return val.replace('T', ' ').split('+')[0].split('.')[0];
+            }
+            return String(val);
         },
     },
 
-
-
     simulated_brightness: {
         id: 'simulated_brightness',
         prop: 'brightness',
@@ -115,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',
@@ -135,6 +143,7 @@ const states = {
 
     brightness: {
         id: 'brightness',
+        prop: 'brightness',
         name: 'Brightness',
         options: ['transition'],
         icon: undefined,
@@ -142,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: {
@@ -163,9 +172,9 @@ const states = {
         write: true,
         read: false,
         type: 'number',
+        def: 0,
         min: -50,
         max: 50,
-        def: 0,
     },
 
     colortemp_move: {
@@ -177,9 +186,9 @@ const states = {
         write: true,
         read: false,
         type: 'number',
+        def: 0,
         min: -50,
         max: 50,
-        def: 0,
     },
 
     transition: {
@@ -191,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',
@@ -207,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',
@@ -249,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',
@@ -289,8 +317,10 @@ const states = {
         min: 0,
         max: 100,
     },
+
     pressure: {
         id: 'pressure',
+        prop: 'pressure',
         name: 'Pressure',
         icon: undefined,
         role: 'value.pressure',
@@ -302,6 +332,7 @@ const states = {
         min: 0,
         max: 10000,
     },
+
     illuminance: {
         id: 'illuminance',
         prop: 'illuminance_lux',
@@ -314,6 +345,30 @@ 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; }
+            return Math.round(Math.pow(10, payload.illuminance / 10000));
+        },
+    },
+
     illuminance_raw: {
         id: 'illuminance_raw',
         prop: 'illuminance',
@@ -326,8 +381,51 @@ 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; }
+            return Math.round(Math.pow(10, payload.illuminance_raw / 10000));
+        },
+    },
+
+    // Fix: prop ergänzt – Z2M sendet payload.occupancy
     occupancy: {
         id: 'occupancy',
+        prop: 'occupancy',
         name: 'Occupancy',
         icon: undefined,
         role: 'sensor.motion',
@@ -336,6 +434,7 @@ const states = {
         type: 'boolean',
         def: false,
     },
+
     contact: {
         id: 'contact',
         prop: 'contact',
@@ -347,6 +446,7 @@ const states = {
         type: 'boolean',
         def: false,
     },
+
     opened: {
         id: 'opened',
         prop: 'contact',
@@ -357,8 +457,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',
@@ -368,7 +473,9 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
+        def: false,
     },
+
     water_leak: {
         id: 'detected',
         prop: 'water_leak',
@@ -380,6 +487,7 @@ const states = {
         type: 'boolean',
         def: false,
     },
+
     batt_low_t_f: {
         id: 'battery_low',
         prop: 'battery_low',
@@ -391,6 +499,7 @@ const states = {
         type: 'boolean',
         def: false,
     },
+
     load_power: {
         id: 'load_power',
         prop: 'power',
@@ -413,11 +522,10 @@ const states = {
         write: false,
         read: true,
         type: 'number',
-        unit: 'A',
         def: 0,
+        unit: 'A',
     },
 
-
     temp_calibration: {
         id: 'temperature_calibration',
         prop: 'temperature_calibration',
@@ -431,6 +539,7 @@ const states = {
         unit: '°C',
         isOption: true,
     },
+
     local_temperature: {
         id: 'local_temperature',
         prop: 'local_temperature',
@@ -443,6 +552,7 @@ const states = {
         def: 0,
         unit: '°C',
     },
+
     local_temperature_calibration: {
         id: 'local_temperature_calibration',
         prop: 'local_temperature_calibration',
@@ -456,7 +566,6 @@ const states = {
         unit: '°C',
     },
 
-
     climate_away_mode: {
         id: 'away_mode',
         prop: 'away_mode',
@@ -466,34 +575,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',
@@ -507,6 +623,7 @@ const states = {
         min: -50,
         max: 50,
     },
+
     hue_move: {
         id: 'hue_move',
         prop: 'hue_move',
@@ -516,15 +633,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,