iobroker.zigbee2mqtt 2.2.0 → 2.3.0

package/README.md

@@ -30,11 +30,22 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 2.3.0 (2022-10-30)
+
+-   (o0shojo0o) added support for the `toggle` of states that support this.
+-   (o0shojo0o) added correct handling of `color_move` and `color_temperature_move`
+
+### 2.2.1 (2022-10-25)
+
+-   (o0shojo0o) fix state roles and access
+-   (o0shojo0o) fix state handling
+-   (o0shojo0o) fix createZ2MMessage
+
 ### 2.2.0 (2022-10-20)
 
 -   (o0shojo0o) added support for [Lidl HG06467 effects](https://www.zigbee2mqtt.io/devices/HG06467.html#trigger-effects)
 -   (o0shojo0o) added support for hs color
--   (o0shojo0o) simulated_brightness data point is added only for supported devices
+-   (o0shojo0o) `simulated_brightness` data point is added only for supported devices
 
 ### 2.1.1 (2022-10-16)
 

package/admin/i18n/de/translations.json

@@ -13,7 +13,7 @@
     "External MQTT-Server Port": "Externer MQTT-Server Port",
     "MQTT-Server IP-Address bind": "MQTT-Server IP-Adresse binden",
     "MQTT-Server Port": "MQTT-Server-Port",
-    "Configure your Zigbee2MQTT WebUi connection": "Zigbee2MQTT WebUi Verbindung Konfiguration",
+    "Configure your Zigbee2MQTT WebUi connection": "Konfiguration der Zigbee2MQTT WebUi Verbindung",
     "WebUi Address": "WebUi Adresse",
     "WebUi Port": "WebUi Port",
     "Color configurations": "Farbkonfigurationen",

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "zigbee2mqtt",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "news": {
+      "2.3.0": {
+        "en": "added support for the `toggle` of states that support this.\nadded correct handling of `color_move` and `color_temperature_move`",
+        "de": "zusätzliche unterstützung für den kippen von staaten, die dies unterstützen.\nkorrekte handhabung von color_move und color_temperature_move",
+        "ru": "добавлена поддержка в отношении государств, которые поддерживают это.\nдобавлена правильная обработка color_move и color_temperature_move",
+        "pt": "acrescentou apoio para o conjunto de estados que apoiam isso.\nadicionado manuseio correto de color_move e color_temperature_move",
+        "nl": "steun toegevoegd voor de toggle van staten die dit ondersteunen.\nvoegde de juiste kleding en kleurtemperatuur toe",
+        "fr": "a ajouté un soutien pour la lutte des etats qui appuient cela.\nla manipulation correcte de color_move et color_temperature_move",
+        "it": "ha aggiunto il sostegno per la lotta di stati che sostengono questo.\naggiunto corretto trattamento di colore_move e colore_temperature_move",
+        "es": "agregó apoyo para la lucha de estados que apoyan esto.\nañadido correcto manejo de color_move y color_temperature_move",
+        "pl": "dodał wsparcie dla porozumień stanów, które to wspierają.\ndodano poprawne zachowanie koloru i kolor_temperature_move",
+        "uk": "додана підтримка для тягових станів, які підтримують це.\nдодано правильну обробку кольором_move та color_ infrastructure_move",
+        "zh-cn": "此外,还支持支持这一国家。.\n· 删除白色、流血和色色色色色彩。"
+      },
+      "2.2.1": {
+        "en": "fix state roles and access\nfix state handling\nfix createZ2MMessage",
+        "de": "zustandsrollen und zugriff beheben\nmanuelle zustandsbearbeitung\nfix erstellenZ2MMessage",
+        "ru": "исправить государственные роли и доступ\nисправить государственную обработку\nисправить CreateZ2MMessage",
+        "pt": "corrigir funções estaduais e acesso\ncorrigir o manuseio do estado\ncorrigir createZ2MMessage",
+        "nl": "vertaling:\nvertaling:\nvertaling:",
+        "fr": "fixer les rôles de l'état et l'accès\nmaniement de l ' état\nfix createZ2MMessage",
+        "it": "fissare i ruoli dello stato e l'accesso\ncorretta gestione dello stato\nfix createZ2MMessage",
+        "es": "fijar funciones estatales y acceso\ncorrección del estado\nfix createZ2MMessage",
+        "pl": "uchwała rola państwowa i dostęp\nnaprawa\ntworzenie Z2MM",
+        "uk": "фіксувати державні ролі і доступ\nфіксувати стан обробки\nфіксатор творуZ2MMessage",
+        "zh-cn": "fix 国家作用和准入\nfix 国家处理\nfix 建立Z2MMessage"
+      },
       "2.2.0": {
         "en": "added support for [Lidl HG06467 effects](https://www.zigbee2mqtt.io/devices/HG06467.html#trigger-effects)\nadded support for hs color\nsimulated_brightness data point is added only for supported devices",
         "de": "unterstützung für [Lidl HG06467-Effekte](https://www.zigbee2mqt.io/devices/HG06467.html#trigger-Effekte)\nunterstützung für hs farbe\nsimuld_brightness-datenpunkt wird nur für unterstützte geräte hinzugefügt",
@@ -66,30 +92,6 @@
         "es": "*! ¡CAMBIANDO\n\nopciones adicionales para MQTT-Server externo\nconexión a zigbe2mqtt completamente rediseñado y cambiado a MQTT\nmuchos bugfixes\nautomáticamente poner las acciones del botón de nuevo a falso\nsoporte añadido para función Zigbee2MQTT simulado_brightness\ncontrol de configuración añadido\nproducción de registro agregada sobre detalles de coordinadores",
         "pl": "! BREAKING CHANGE! (ANG.)\n\nobsługa MQTT-Server\nzigbe2mqtt całkowicie przerobił i zmienił MQTT\nwiele błędów\nautomatycznie ustawione akcje przycisku\ndodano obsługę Zigbee2MQTT\nsprawdzać\ndokładna produkcja logów na temat szczegółów koordynacji",
         "zh-cn": "页:1 BREAKREANGE*\n\n外贸总协定\n与zigbe2mqt完全重新工作,并改装到外贸总协定\n批发\n自动建立但顿行动回到虚假的行动\n对Zigbee2MQTT特征的增援\n增幅检查\n协调员的产出"
-      },
-      "0.2.0": {
-        "en": "group states corrected\nadded option 'Use Kelvin instead of mired for the color temps'\nremove available logic, now will use the information from z2m\nrename noLogDevices to logfilter\nlots of bugfixes\nadded noLogDevices functionality\nadded debugmessage for specific device functionality\nadded some states are default false\nadded support for scenes defined on a device\nfix available state role\nfix subscribeWritableStates",
-        "de": "gruppenzustände korrigiert\nzusatzoption 'Use Kelvin anstelle von mired für die Farbe Tempos '\ndie verfügbare logik entfernen, jetzt die informationen von z2m verwenden\numbenennen noLogDevices zum Logfilter\nviele bugfixes\nnoLogDevices Funktionalität hinzugefügt\ndebugmessage für spezifische gerätefunktionalität\neinige zustände standardmäßig falsch hinzugefügt\nunterstützung für szenen, die auf einem gerät definiert sind\nfix verfügbare zustandsrolle\nabonnierenWritableState",
-        "ru": "исправлены состояния группы\nдобавлена опция 'Используйте Kelvin вместо mired для цветовых темп « »\nудалить доступную логику, теперь будет использовать информацию из z2m\nпереименовать noLogDevices для logfilter\nмного багфиксов\nдобавлена функция noLogDevices\nдобавлено debugmessage для конкретной функциональности устройства\nдобавлены некоторые государства по умолчанию false\nдобавлена поддержка сцен, определенных на устройстве\nисправить доступную государственную роль\nисправить подпискуWritableStates",
-        "pt": "estados do grupo corrigidos\nopção adicionada 'Use Kelvin em vez de mired para os temps de cor '\nremover a lógica disponível, agora usará as informações do z2m\nrenomear noLogDevices para logfilter\nlotes de correções de bugs\nadicionado noLogDevices funcionalidade\nadicionado debugmessage para funcionalidade específica do dispositivo\nadicionado alguns estados são padrão falso\nsuporte adicionado para cenas definidas em um dispositivo\ncorrigir a função estadual disponível\ncorrigir assinantesEstados disponíveis",
-        "nl": "de groep zegt:\nvoegde optie 'Use Kelvin' in plaats van de kleuren tempen '\nverwijder de logica, nu zal de informatie van z2m gebruiken\nnoLog Devices\nveel insectenfixen\nnoLog Devices functionaliteit\nvoegde debugmesage toe voor specifieke apparaat functionaliteit\nsommige staten zijn vals\nsteun voor scènes gedefinieerd op een apparaat\nbeschikbare staatsrol\nvertaling:",
-        "fr": "états de groupe corrigés\noption ajoutée 'Utiliser Kelvin au lieu de mired pour le temps de couleur '\nsupprimer la logique disponible, maintenant utilisera les informations de z2m\nrenommer noLogDevices to logfilter\nbeaucoup de bugfixes\najout de fonctionnalité noLogDevices\najout debugmessage pour la fonctionnalité de périphérique spécifique\ncertains états ajoutés sont par défaut faux\nsupport ajouté pour les scènes définies sur un appareil\nle rôle de l ' état\nfixer souscrire",
-        "it": "gruppo stati corretti\nopzione aggiunta 'Usa Kelvin invece di mired per le tentazioni di colore '\nrimuovere la logica disponibile, ora userà le informazioni da z2m\nrinominare noLogDevices per logfilter\nmolti bugfix\naggiunto noLogDevices funzionalità\ndebugmessage aggiunto per funzionalità specifiche del dispositivo\naggiunto alcuni stati sono falsi di default\nsupporto aggiunto per scene definite su un dispositivo\ncorrezione del ruolo di stato disponibile\nfissare abbonamentiWritableStates",
-        "es": "estados del grupo corregidos\nopción agregada 'Use Kelvin en lugar de mired para el color temps '\neliminar la lógica disponible, ahora utilizará la información de z2m\nnoLogDevices to logfilter\nmuchos bugfixes\nnoLogDevices funcionalidad\ndebugmesage añadido para la funcionalidad específica del dispositivo\nañadido algunos estados son falsos\nsoporte añadido para escenas definidas en un dispositivo\nfijar la función estatal disponible\nfijar suscriptosEstados disponibles",
-        "pl": "państwa grupowe poprawiły\ndodał opcję 'Use Kelvin' zamiast śmiać kolorowe tempo. '\nzdejmowanie dostępnej logiki wykorzystuje obecnie informacje z 2 m\nnazwa NoLogDevices (ang.)\nwiele błędów\ndodano obsługę NoLogDevices\ndodanie debugmessage dla konkretnej funkcjonalności\ndodanie niektórych stanów jest fałszywe\ndodano wsparcie dla scen zdefiniowanych na urządzenie\nfunkcja stanowa\nrecovery",
-        "zh-cn": "更正\n加上“Use Kelvin”的备选办法,而不是对色彩的诱惑。 评 注\n删除现有逻辑,现在将使用兹2m的信息。\n目 录\n批发\n增加无车辆功能\n增加特定装置功能的碎片\n另有一些国家的违约情况\n对一个装置所界定的场地的更多支持\nf 现有国家作用\nfix 有线性的国家"
-      },
-      "0.1.0": {
-        "en": "first release",
-        "de": "erste veröffentlichung",
-        "ru": "первый релиз",
-        "pt": "primeiro lançamento",
-        "nl": "eerste vrijlating",
-        "fr": "première version",
-        "it": "primo rilascio",
-        "es": "primera liberación",
-        "pl": "pierwsze wydanie",
-        "zh-cn": "首次释放"
       }
     },
     "titleLang": {

package/lib/deviceController.js

@@ -3,14 +3,16 @@ const defineDeviceFromExposes = require('./exposes').defineDeviceFromExposes;
 const utils = require('./utils');
 const colors = require('./colors.js');
 const rgb = require('./rgb.js');
-const createCache = {};
+//const createCache = {};
 
 class DeviceController {
-    constructor(adapter, deviceCache, groupCache, config) {
+    constructor(adapter, deviceCache, groupCache, config, logCustomizations, createCache) {
         this.adapter = adapter;
         this.groupCache = groupCache;
         this.deviceCache = deviceCache;
         this.config = config;
+        this.logCustomizations = logCustomizations;
+        this.createCache = createCache;
     }
 
     async createDeviceDefinitions(exposes) {
@@ -24,6 +26,9 @@ class DeviceController {
                         scenes = scenes.concat(expose.endpoints[key].scenes);
                     }
                 }
+                if (this.logCustomizations.debugDevices.includes(expose.ieee_address)) {
+                    this.adapter.log.warn(`--->>> fromZ2M -> ${expose.ieee_address} exposes: ${JSON.stringify(expose)}`);
+                }
                 // if the device is already present in the cache, remove it
                 this.removeDeviceByIeee(this.deviceCache, expose.ieee_address);
                 defineDeviceFromExposes(this.deviceCache, expose.friendly_name, expose.ieee_address, expose.definition, expose.power_source, scenes, this.config);
@@ -142,7 +147,7 @@ class DeviceController {
     async createOrUpdateDevices() {
         for (const device of this.groupCache.concat(this.deviceCache)) {
             const deviceName = device.id == device.ieee_address ? '' : device.id;
-            if (!createCache[device.ieee_address] || createCache[device.ieee_address].common.name != deviceName) {
+            if (!this.createCache[device.ieee_address] || this.createCache[device.ieee_address].name != deviceName) {
                 const deviceObj = {
                     type: 'device',
                     common: {
@@ -160,7 +165,7 @@ class DeviceController {
 
                 //@ts-ignore
                 await this.adapter.extendObjectAsync(device.ieee_address, deviceObj);
-                createCache[device.ieee_address] = deviceObj;
+                this.createCache[device.ieee_address] = { name: deviceName };
             }
 
             // Here it is checked whether the scenes match the current data from z2m.
@@ -175,14 +180,15 @@ class DeviceController {
             }
 
             for (const state of device.states) {
-                if (!createCache[device.ieee_address][state.id] || createCache[device.ieee_address][state.id].name != state.name) {
-                    const iobState = await this.copyAndCleanStateObj(state);
-                    await this.adapter.extendObjectAsync(`${device.ieee_address}.${state.id}`, {
+                if (!this.createCache[device.ieee_address][state.id] || this.createCache[device.ieee_address][state.id].name != state.name) {
+                    const iobState = {
                         type: 'state',
-                        common: iobState,
+                        common: await this.copyAndCleanStateObj(state),
                         native: {},
-                    });
-                    createCache[device.ieee_address][state.id] = state.name;
+                    };
+
+                    await this.adapter.extendObjectAsync(`${device.ieee_address}.${state.id}`, iobState);
+                    this.createCache[device.ieee_address][state.id] = { name: state.name, created: true };
                 }
             }
         }
@@ -212,6 +218,7 @@ class DeviceController {
         if (ieee_address != undefined) {
             this.adapter.setStateAsync(`${ieee_address}.available`, false, true);
             this.adapter.extendObject(`${ieee_address}`, { common: { name: 'Device removed!', } });
+            delete this.createCache[ieee_address];
         }
     }
 

package/lib/exposes.js

@@ -8,10 +8,38 @@ const utils = require('./utils');
 const colors = require('./colors');
 const getNonGenDevStatesDefs = require('./nonGenericDevicesExtension').getStateDefinition;
 
+// https://www.zigbee2mqtt.io/guide/usage/exposes.html#access
+const z2mAccess = {
+    /**
+     * Bit 0: The property can be found in the published state of this device
+     */
+    STATE: 1,
+    /**
+     * Bit 1: The property can be set with a /set command
+     */
+    SET: 2,
+    /**
+     * Bit 2: The property can be retrieved with a /get command
+     */
+    GET: 4,
+    /**
+     * Bitwise inclusive OR of STATE and SET : 0b001 | 0b010
+     */
+    STATE_SET: 3,
+    /**
+     * Bitwise inclusive OR of STATE and GET : 0b001 | 0b100
+     */
+    STATE_GET: 5,
+    /**
+     * Bitwise inclusive OR of STATE and GET and SET : 0b001 | 0b100 | 0b010
+     */
+    ALL: 7,
+};
+
 function genState(expose, role, name, desc) {
     let state;
-    const readable = true; //expose.access > 0;
-    const writable = expose.access > 1;
+    const readable = (expose.access & z2mAccess.STATE) > 0;
+    const writable = (expose.access & z2mAccess.SET) > 0;
     const stname = (name || expose.property);
 
     if (typeof stname !== 'string') {
@@ -121,22 +149,13 @@ function genState(expose, role, name, desc) {
 
 function createFromExposes(deviceID, ieee_address, definitions, power_source, scenes, config) {
     const states = [];
-    // make the different (set and get) part of state is updatable if different exposes is used for get and set
-    // as example:
-    //  ...
-    //  exposes.binary('some_option', ea.STATE, true, false).withDescription('Some Option'),
-    //  exposes.composite('options', 'options')
-    //      .withDescription('Some composite Options')
-    //      .withFeature(exposes.binary('some_option', ea.SET, true, false).withDescription('Some Option'))
-    //in this case one state - `some_option` has two different exposes for set an get, we have to combine it ...
-
     function pushToStates(state, access) {
         if (state === undefined) {
             return 0;
         }
-
-        state.readable = true;
-        state.writable = access > 1;
+        if (access === undefined) access = z2mAccess.ALL;
+        state.readable = (access & z2mAccess.STATE) > 0;
+        state.writable = (access & z2mAccess.SET) > 0;
         const stateExists = states.findIndex((x, _index, _array) => (x.id === state.id));
 
         if (stateExists < 0) {
@@ -264,6 +283,21 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                                 epname: expose.endpoint,
                                 setattr: 'state',
                             }, prop.access);
+                            // features contains TOGGLE?
+                            if (prop.value_toggle) {
+                                pushToStates({
+                                    id: `${prop.property}_toggle`,
+                                    prop: `${prop.property}_toggle`,
+                                    name: `Toggle state of the ${prop.property}`,
+                                    icon: undefined,
+                                    role: 'button',
+                                    write: true,
+                                    read: true,
+                                    type: 'boolean',
+                                    setattr: prop.property,
+                                    setter: (value) => (value) ? prop.value_toggle : undefined
+                                });
+                            }
                             break;
                         }
                         case 'brightness': {
@@ -379,7 +413,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                                 },
                                 epname: expose.endpoint,
                                 setattr: 'color',
-                            }, 2);
+                            }, prop.access);
                             break;
                         }
                         case 'color_hs': {
@@ -415,7 +449,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                                 },
                                 epname: expose.endpoint,
                                 setattr: 'color',
-                            }, 2);
+                            }, prop.access);
                             // pushToStates({
                             // 	id: expose.endpoint ? `hue_${expose.endpoint}` : 'hue',
                             // 	prop: expose.endpoint ? `color_${expose.endpoint}` : 'color',
@@ -539,7 +573,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                             break;
                         }
                         default:
-                            pushToStates(genState(prop), 2);
+                            pushToStates(genState(prop), prop.access);
                             break;
                     }
                 }
@@ -552,6 +586,21 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                     switch (prop.name) {
                         case 'state':
                             pushToStates(genState(prop, 'switch'), prop.access);
+                            // features contains TOGGLE?
+                            if (prop.value_toggle) {
+                                pushToStates({
+                                    id: `${prop.property}_toggle`,
+                                    prop: `${prop.property}_toggle`,
+                                    name: `Toggle state of the ${prop.property}`,
+                                    icon: undefined,
+                                    role: 'button',
+                                    write: true,
+                                    read: true,
+                                    type: 'boolean',
+                                    setattr: prop.property,
+                                    setter: (value) => (value) ? prop.value_toggle : undefined
+                                });
+                            }
                             break;
                         default:
                             pushToStates(genState(prop), prop.access);
@@ -631,21 +680,22 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                 switch (expose.name) {
                     case 'action': {
 
-                        // Ansatz:
-
-                        // Action aufspalten in 2 Blöcke:
-                        // Action (bekommt text ausser hold und release, auto reset nach 250 ms)
-                        // Hold: wird gesetzt bei hold, gelöscht bei passendem Release
+                        if (!Array.isArray(expose.values)) {
+                            break;
+                        }
 
-                        if (!Array.isArray(expose.values)) break;
                         const hasHold = expose.values.find((actionName) => actionName.includes('hold'));
                         const hasRelease = expose.values.find((actionName) => actionName.includes('release'));
+
                         for (const actionName of expose.values) {
                             // is release state ? - skip
-                            if (hasHold && hasRelease && actionName.includes('release')) continue;
+                            if (hasHold && hasRelease && actionName.includes('release')) {
+                                continue;
+                            }
+
                             // is hold state ?
                             if (hasHold && hasRelease && actionName.includes('hold')) {
-                                state = {
+                                pushToStates({
                                     id: actionName.replace(/\*/g, ''),
                                     prop: 'action',
                                     name: actionName,
@@ -667,9 +717,67 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                                         }
                                         return undefined;
                                     },
-                                };
-                            } else {
-                                state = {
+                                }, expose.access);
+                            }
+                            else if (actionName.includes('color_temperature_move')) {
+                                pushToStates({
+                                    id: 'color_temperature_move',
+                                    prop: 'action',
+                                    name: 'Color temperature move value',
+                                    icon: undefined,
+                                    role: 'level.color.temperature',
+                                    write: false,
+                                    read: true,
+                                    type: 'number',
+                                    def: config.useKelvin == true ? utils.miredKelvinConversion(150) : 500,
+                                    min: config.useKelvin == true ? utils.miredKelvinConversion(500) : 150,
+                                    max: config.useKelvin == true ? utils.miredKelvinConversion(150) : 500,
+                                    unit: config.useKelvin == true ? 'K' : 'mired',
+                                    getter: (payload) => {
+                                        if (payload.action != 'color_temperature_move') {
+                                            return undefined;
+                                        }
+
+                                        if (payload.action_color_temperature) {
+                                            if (config.useKelvin == true) {
+                                                return utils.miredKelvinConversion(payload.action_color_temperature);
+                                            }
+                                            else {
+                                                return payload.action_color_temperature;
+                                            }
+                                        }
+                                    },
+                                }, expose.access);
+
+                            }
+                            else if (actionName.includes('color_move')) {
+                                pushToStates({
+                                    id: 'color_move',
+                                    prop: 'action',
+                                    name: 'Color move value',
+                                    icon: undefined,
+                                    role: 'level.color.rgb',
+                                    write: false,
+                                    read: true,
+                                    type: 'string',
+                                    def: '#ffffff',
+                                    getter: (payload) => {
+                                        if (payload.action != 'color_move') {
+                                            return undefined;
+                                        }
+
+                                        if (payload.action_color && payload.action_color.hasOwnProperty('x') && payload.action_color.hasOwnProperty('y')) {
+                                            const colorval = rgb.cie_to_rgb(payload.action_color.x, payload.action_color.y);
+                                            return '#' + utils.decimalToHex(colorval[0]) + utils.decimalToHex(colorval[1]) + utils.decimalToHex(colorval[2]);
+                                        }
+                                        else {
+                                            return undefined;
+                                        }
+                                    }
+                                }, expose.access);
+                            }
+                            else {
+                                pushToStates({
                                     id: actionName.replace(/\*/g, ''),
                                     prop: 'action',
                                     name: actionName,
@@ -681,27 +789,12 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                                     def: false,
                                     isEvent: true,
                                     getter: payload => (payload.action === actionName) ? true : undefined,
-                                };
+                                }, expose.access);
                             }
-                            pushToStates(state, expose.access);
                         }
                         // Can the device simulated_brightness?
                         if (definitions.options && definitions.options.find(x => x.property == 'simulated_brightness')) {
-                            pushToStates({
-                                id: 'simulated_brightness',
-                                prop: 'brightness',
-                                name: 'Simulated brightness',
-                                icon: undefined,
-                                role: 'level.dimmer',
-                                write: true,
-                                read: true,
-                                type: 'number',
-                                unit: '%',
-                                def: 0,
-                                getter: payload => {
-                                    return utils.bulbLevelToAdapterLevel(payload.brightness);
-                                },
-                            }, 1);
+                            pushToStates(statesDefs.simulated_brightness, z2mAccess.STATE);
                         }
                         state = null;
                         break;
@@ -720,7 +813,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                     switch (expose.name) {
                         case 'contact':
                             state = statesDefs.contact;
-                            pushToStates(statesDefs.opened, 1);
+                            pushToStates(statesDefs.opened, expose.access);
                             break;
 
                         case 'battery_low':
@@ -763,6 +856,21 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                     switch (prop.name) {
                         case 'state':
                             pushToStates(genState(prop, 'switch'), prop.access);
+                            // features contains TOGGLE?
+                            if (prop.value_toggle) {
+                                pushToStates({
+                                    id: `${prop.property}_toggle`,
+                                    prop: `${prop.property}_toggle`,
+                                    name: `Toggle state of the ${prop.property}`,
+                                    icon: undefined,
+                                    role: 'button',
+                                    write: true,
+                                    read: true,
+                                    type: 'boolean',
+                                    setattr: prop.property,
+                                    setter: (value) => (value) ? prop.value_toggle : undefined
+                                });
+                            }
                             break;
                         default:
                             pushToStates(genState(prop), prop.access);
@@ -783,6 +891,12 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                         case 'running_mode':
                             pushToStates(statesDefs.climate_running_mode, prop.access);
                             break;
+                        case 'local_temperature':
+                            pushToStates(statesDefs.hvacThermostat_local_temp, prop.access);
+                            break;
+                        case 'local_temperature_calibration':
+                            pushToStates(statesDefs.hvacThermostat_local_temp_calibration, prop.access);
+                            break;
                         default:
                             {
                                 if (prop.name.includes('heating_setpoint')) {
@@ -809,7 +923,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                         return result;
                     };
                     // if we have a composite expose, the value have to be an object {expose.property : {prop.property: value}}
-                    if (prop.access & 2) {
+                    if (prop.access & z2mAccess.SET) {
                         st.setter = (value, options) => {
                             const result = {};
                             options[prop.property] = value;
@@ -819,7 +933,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                         st.setattr = expose.property;
                     }
                     // if we have a composite expose, the payload will be an object {expose.property : {prop.property: value}}
-                    if (prop.access & 1) {
+                    if (prop.access & z2mAccess.STATE) {
                         st.getter = payload => {
                             if ((payload.hasOwnProperty(expose.property)) && (payload[expose.property] !== null) && payload[expose.property].hasOwnProperty(prop.property)) {
                                 return !isNaN(payload[expose.property][prop.property]) ? payload[expose.property][prop.property] : undefined;
@@ -841,22 +955,15 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
     // If necessary, add states defined for this device model.
     // Unfortunately this is necessary for some device models because they do not adhere to the standard
     for (const state of getNonGenDevStatesDefs(definitions.model)) {
-        pushToStates(state, state.write ? 2 : 1);
+        pushToStates(state, state.write ? z2mAccess.SET : z2mAccess.STATE);
     }
 
     // Add default states
-    pushToStates(statesDefs.available, 1);
-
-    const newDevice = {
-        id: deviceID,
-        ieee_address: ieee_address,
-        power_source: power_source,
-        states: states,
-    };
+    pushToStates(statesDefs.available, z2mAccess.STATE);
 
     // Create buttons for scenes
     for (const scene of scenes) {
-        const sceneSate = {
+        pushToStates({
             id: `scene_${scene.id}`,
             prop: `scene_recall`,
             name: scene.name,
@@ -866,11 +973,16 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
             read: true,
             type: 'boolean',
             setter: (value) => (value) ? scene.id : undefined
-        };
-        // @ts-ignore
-        newDevice.states.push(sceneSate);
+        });
     }
 
+    const newDevice = {
+        id: deviceID,
+        ieee_address: ieee_address,
+        power_source: power_source,
+        states: states,
+    };
+
     return newDevice;
 }
 

package/lib/states.js

@@ -56,8 +56,8 @@ const unitLookup = {
     'frequency': 'Hz',
     'power_factor': 'pf',
     'illuminance_lux': 'lx',
-
 };
+
 const timers = {};
 
 const states = {
@@ -72,7 +72,7 @@ const states = {
         type: 'number',
         min: 0,
         max: 255,
-        def: 10,
+        def: 0,
     },
 
     available: {
@@ -86,6 +86,108 @@ const states = {
         type: 'boolean',
         def: false,
     },
+
+    color_read: {
+        id: 'color',
+        prop: 'action',
+        name: 'Color',
+        icon: undefined,
+        role: 'level.color.rgb',
+        write: false,
+        read: true,
+        type: 'string',
+        def: '#ffffff',
+        getter: (payload) => {
+            if (payload.action != 'color_wheel') {
+                return undefined;
+            }
+
+            if (payload.color && payload.color.hasOwnProperty('x') && payload.color.hasOwnProperty('y')) {
+                const colorval = rgb.cie_to_rgb(payload.color.x, payload.color.y);
+                return '#' + utils.decimalToHex(colorval[0]) + utils.decimalToHex(colorval[1]) + utils.decimalToHex(colorval[2]);
+            }
+            else {
+                return undefined;
+            }
+        },
+    },
+
+    simulated_brightness: {
+        id: 'simulated_brightness',
+        prop: 'brightness',
+        name: 'Simulated brightness',
+        icon: undefined,
+        role: 'level.dimmer',
+        write: true,
+        read: true,
+        type: 'number',
+        unit: '%',
+        def: 0,
+        getter: payload => {
+            return utils.bulbLevelToAdapterLevel(payload.brightness);
+        },
+    },
+
+    state: {
+        id: 'state',
+        name: 'Switch state',
+        icon: undefined,
+        role: 'switch',
+        write: true,
+        read: true,
+        type: 'boolean',
+        getter: payload => (payload.state === 'ON'),
+        setter: (value) => (value) ? 'ON' : 'OFF',
+    },
+
+    brightness: {
+        id: 'brightness',
+        name: 'Brightness',
+        icon: undefined,
+        role: 'level.dimmer',
+        write: true,
+        read: true,
+        type: 'number',
+        unit: '%',
+        min: 0,
+        max: 100,
+        getter: payload => {
+            return utils.bulbLevelToAdapterLevel(payload.brightness);
+        },
+        setter: (value) => {
+            return utils.adapterLevelToBulbLevel(value);
+        }
+    },
+
+    brightness_move: {
+        id: 'brightness_move',
+        prop: 'brightness_move',
+        name: 'Dimming',
+        icon: undefined,
+        role: 'state',
+        write: true,
+        read: false,
+        type: 'number',
+        min: -50,
+        max: 50,
+        def: 0
+    },
+
+    colortemp_move: {
+        id: 'colortemp_move',
+        prop: 'color_temp_move',
+        name: 'Colortemp change',
+        icon: undefined,
+        role: 'state',
+        write: true,
+        read: false,
+        type: 'number',
+        min: -50,
+        max: 50,
+        def: 0
+    },
+
+    //#################################################################
     device_query: { // button to trigger device read
         id: 'device_query',
         prop: 'device_query',
@@ -462,22 +564,7 @@ const states = {
         isEvent: true,
         getter: payload => (payload.click === 'both_double') ? true : undefined,
     },
-    state: {
-        id: 'state',
-        name: 'Switch state',
-        icon: undefined,
-        role: 'switch',
-        write: true,
-        read: true,
-        type: 'boolean',
-        getter: payload => (payload.state === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
-        setterOpt: (value, options) => {
-            const stateValue = (value ? 'ON' : 'OFF');
-            return { ...options, state: stateValue };
-        },
-        inOptions: true,
-    },
+
     stateEp: {
         id: 'state',
         name: 'Switch state',
@@ -1182,37 +1269,7 @@ const states = {
             return utils.bulbLevelToAdapterLevel(payload.brightness);
         },
     },
-    brightness: {
-        id: 'brightness',
-        name: 'Brightness',
-        icon: undefined,
-        role: 'level.dimmer',
-        write: true,
-        read: true,
-        type: 'number',
-        unit: '%',
-        min: 0,
-        max: 100,
-        getter: payload => {
-            return utils.bulbLevelToAdapterLevel(payload.brightness);
-        },
-        setter: (value, options) => {
-            return utils.adapterLevelToBulbLevel(value);
-        },
-        setterOpt: (value, options) => {
-            const hasTransitionTime = options && options.hasOwnProperty('transition_time');
-            const transitionTime = hasTransitionTime ? options.transition_time : 0;
-            const preparedOptions = { ...options, transition: transitionTime };
-            preparedOptions.brightness = utils.adapterLevelToBulbLevel(value);
-            return preparedOptions;
-        },
-        readResponse: (resp) => {
-            const respObj = resp[0];
-            if (respObj.status === 0 && respObj.attrData != undefined) {
-                return utils.bulbLevelToAdapterLevel(respObj.attrData);
-            }
-        },
-    },
+
     colortemp: {
         id: 'colortemp',
         prop: 'color_temp',
@@ -2153,7 +2210,7 @@ const states = {
 
     // hvac Thermostat cluster - generic states
     hvacThermostat_local_temp: {
-        id: 'local_temp',
+        id: 'local_temperature',
         prop: 'local_temperature',
         name: 'Local Temperature',
         icon: undefined,
@@ -2164,7 +2221,7 @@ const states = {
         unit: '°C',
     },
     hvacThermostat_local_temp_calibration: {
-        id: 'local_temp_calibration',
+        id: 'local_temperature_calibration',
         prop: 'local_temperature_calibration',
         name: 'Temperature Calibration',
         icon: undefined,
@@ -2173,6 +2230,7 @@ const states = {
         read: true,
         type: 'number',
         unit: '°C',
+        def: 0
     },
     hvacThermostat_remote_sensing: {
         id: 'remote_sensing',
@@ -5292,32 +5350,6 @@ const states = {
         min: -50,
         max: 50
     },
-    brightness_move: {
-        id: 'brightness_move',
-        prop: 'brightness_move',
-        name: 'Dimming',
-        icon: undefined,
-        role: 'state',
-        write: true,
-        read: false,
-        type: 'number',
-        min: -50,
-        max: 50,
-        def: 0
-    },
-    colortemp_move: {
-        id: 'colortemp_move',
-        prop: 'color_temp_move',
-        name: 'Colortemp change',
-        icon: undefined,
-        role: 'state',
-        write: true,
-        read: false,
-        type: 'number',
-        min: -50,
-        max: 50,
-        def: 0
-    },
     hue_move: {
         id: 'hue_move',
         prop: 'hue_move',

package/lib/statesController.js

@@ -3,11 +3,12 @@ const incStatsQueue = [];
 const timeOutCache = {};
 
 class StatesController {
-    constructor(adapter, deviceCache, groupCache, logCustomizations) {
+    constructor(adapter, deviceCache, groupCache, logCustomizations, createCache) {
         this.adapter = adapter;
         this.groupCache = groupCache;
         this.deviceCache = deviceCache;
         this.logCustomizations = logCustomizations;
+        this.createCache = createCache;
     }
 
     processDeviceMessage(messageObj) {
@@ -49,6 +50,13 @@ class StatesController {
 
                 const stateName = `${device.ieee_address}.${state.id}`;
 
+                // It may be that the state has not yet been created!
+                if (!this.createCache[device.ieee_address] || !this.createCache[device.ieee_address][state.id] || !this.createCache[device.ieee_address][state.id].created) {
+                    incStatsQueue[incStatsQueue.length] = messageObj;
+                    //this.adapter.log.debug(`State ${stateName} is not yet created, queue state in incStatsQueue!`);
+                    continue;
+                }
+
                 try {
                     if (state.isEvent) {
                         if (state.getter) {

package/lib/z2mController.js

@@ -36,16 +36,16 @@ class Z2mController {
             stateID = deviceState.prop;
         }
 
-        let topic = `${device.ieee_address}/set`;
-        if (device.ieee_address.includes('group_')) {
-            topic = `${device.id}/set`;
+        if (deviceState.setattr) {
+            stateID = deviceState.setattr;
         }
 
+
         const controlObj = {
             payload: {
                 [stateID]: stateVal
             },
-            topic: topic
+            topic: `${device.id}/set`
         };
 
         // set stats with the mentioned role or ids always immediately to ack = true, because these are not reported back by Zigbee2MQTT

package/main.js

@@ -23,6 +23,7 @@ let mqttClient;
 let deviceCache = [];
 // eslint-disable-next-line prefer-const
 let groupCache = [];
+const createCache = {};
 const logCustomizations = { debugDevices: '', logfilter: [] };
 let showInfo = true;
 let statesController;
@@ -44,8 +45,8 @@ class Zigbee2mqtt extends core.Adapter {
     }
 
     async onReady() {
-        statesController = new StatesController(this, deviceCache, groupCache, logCustomizations);
-        deviceController = new DeviceController(this, deviceCache, groupCache, this.config);
+        statesController = new StatesController(this, deviceCache, groupCache, logCustomizations, createCache);
+        deviceController = new DeviceController(this, deviceCache, groupCache, this.config, logCustomizations, createCache);
         z2mController = new Z2mController(this, deviceCache, groupCache, logCustomizations);
 
         // Initialize your adapter here

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen",
@@ -24,25 +24,25 @@
     "aedes-persistence-nedb": "^2.0.3",
     "mqtt": "^4.3.7",
     "net": "^1.0.2",
-    "ws": "^8.9.0"
+    "ws": "^8.10.0"
   },
   "devDependencies": {
     "@alcalzone/release-script-plugin-iobroker": "^3.5.9",
     "@alcalzone/release-script-plugin-license": "^3.5.9",
     "@alcalzone/release-script": "^3.5.9",
-    "@iobroker/adapter-dev": "^1.1.0",
+    "@iobroker/adapter-dev": "^1.2.0",
     "@iobroker/testing": "^4.1.0",
     "@tsconfig/node14": "^1.0.3",
     "@types/chai": "^4.3.3",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.0",
-    "@types/node": "^18.11.0",
+    "@types/node": "^18.11.7",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.8",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.25.0",
+    "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "mocha": "^10.1.0",