iobroker.zigbee 1.10.13 → 2.0.0

package/lib/zigbeecontroller.js

@@ -148,9 +148,9 @@ class ZigbeeController extends EventEmitter {
             }
 
             this.debug(`Zigbee network parameters: panID=${debNetworkParam.panID} channel=${debNetworkParam.channel} extendedPanID=${extPanIDDebug}`);
-        } catch (e) {
-            this.sendError(e);
-            this.error(`Starting zigbee-herdsman problem : ${JSON.stringify(e.message)}`);
+        } catch (error) {
+            this.sendError(error);
+            this.error(`Starting zigbee-herdsman problem : ${(error && error.message ? error.message : 'no error message')}`);
             throw 'Error herdsman start';
         }
         // Check if we have to turn off the LED
@@ -297,7 +297,7 @@ class ZigbeeController extends EventEmitter {
             }
         } catch (error) {
             this.sendError(error);
-            this.error(JSON.stringify(error));
+            this.error(`error in getGroups: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
             return undefined;
         }
     }
@@ -308,7 +308,7 @@ class ZigbeeController extends EventEmitter {
             group && group.removeFromNetwork();
         } catch (error) {
             this.sendError(error);
-            this.error(`error in removeGroupById: ${error}`);
+            this.error(`error in removeGroupById: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
         }
     }
 
@@ -322,24 +322,34 @@ class ZigbeeController extends EventEmitter {
     }
 
     async verifyGroupExists(id) {
-        const nid = typeof id === 'number' ? id : parseInt(id);
-        let group = await this.herdsman.getGroupByID(nid);
-        if (!group) {
-            group = await this.herdsman.createGroup(nid);
-            group.toZigbee = groupConverters;
-            group.model = 'group';
-            this.debug(`verifyGroupExists: created group ${nid}`);
-        } else {
-            this.debug(`verifyGroupExists: group ${nid} exists`);
+        try {
+            const nid = typeof id === 'number' ? id : parseInt(id);
+            let group = await this.herdsman.getGroupByID(nid);
+            if (!group) {
+                group = await this.herdsman.createGroup(nid);
+                group.toZigbee = groupConverters;
+                group.model = 'group';
+                this.debug(`verifyGroupExists: created group ${nid}`);
+            } else {
+                this.debug(`verifyGroupExists: group ${nid} exists`);
+            }
+        }
+        catch (error) {
+            this.error(`verifyGroupExists: ${error && error.message ? error.message : 'unspecified error'}`);
         }
     }
 
     async addPairingCode(code) {
         this.debug(`calling addPairingCode with ${code}`);
         if (code) {
-            await this.herdsman.addInstallCode(code);
-            this.info(`added code ${code} for pairing`);
-            return true;
+            try {
+                await this.herdsman.addInstallCode(code);
+                this.info(`added code ${code} for pairing`);
+                return true;
+            }
+            catch (error) {
+                this.error(`addPairingCode: ${error && error.message ? error.message : 'unspecified error'}`);
+            }
         }
         return false;
     }
@@ -369,7 +379,7 @@ class ZigbeeController extends EventEmitter {
         } catch (error) {
             this.sendError(error);
             if (error) {
-                this.error(`getGroupMembersFromController: error is  ${JSON.stringify(error)} ${JSON.stringify(new Error().stack)}`);
+                this.error(`getGroupMembersFromController: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
             } else {
                 this.error('unidentified error in getGroupMembersFromController');
             }
@@ -378,100 +388,125 @@ class ZigbeeController extends EventEmitter {
     }
 
     getDevice(key) {
-        return this.herdsman.getDeviceByIeeeAddr(key);
+        try {
+            return this.herdsman.getDeviceByIeeeAddr(key);
+        }
+        catch {
+            return undefined;
+        }
     }
 
     getDevicesByType(type) {
-        return this.herdsman.getDevicesByType(type);
+        try {
+            return this.herdsman.getDevicesByType(type);
+        }
+        catch {
+            return undefined;
+        }
     }
 
     getDeviceByNetworkAddress(networkAddress) {
-        return this.herdsman.getDeviceByNetworkAddress(networkAddress);
+        try {
+            return this.herdsman.getDeviceByNetworkAddress(networkAddress);
+        }
+        catch {
+            return undefined;
+        }
     }
 
     async resolveEntity(key, ep) {
         // assert(typeof key === 'string' || key.constructor.name === 'Device', `Wrong type '${typeof key}'`);
-
-        if (typeof key === 'string') {
-            if (key === 'coordinator') {
-                const coordinator = this.herdsman.getDevicesByType('Coordinator')[0];
-                return {
-                    type: 'device',
-                    device: coordinator,
-                    endpoint: coordinator.getEndpoint(1),
-                    name: 'Coordinator',
-                };
-            } else {
-                const device = await this.herdsman.getDeviceByIeeeAddr(key);
-                if (device) {
-                    const mapped = await zigbeeHerdsmanConverters.findByDevice(device);
-                    const endpoints = mapped && mapped.endpoint ? mapped.endpoint(device) : null;
-                    let endpoint;
-                    if (endpoints && ep != undefined && endpoints[ep]) {
-                        endpoint = device.getEndpoint(endpoints[ep]);
-                    } else if (endpoints && endpoints['default']) {
-                        endpoint = device.getEndpoint(endpoints['default']);
-                    } else {
-                        const epNum = parseInt(ep);
-                        if (!isNaN(epNum)) {
-                            endpoint = device.getEndpoint(epNum);
-                        } else {
-                            endpoint = device.endpoints[0];
-                        }
-                    }
+        try {
+            if (typeof key === 'string') {
+                if (key === 'coordinator') {
+                    const coordinator = this.herdsman.getDevicesByType('Coordinator')[0];
                     return {
                         type: 'device',
-                        device,
-                        mapped,
-                        endpoint,
-                        endpoints: device.endpoints,
-                        name: key,
+                        device: coordinator,
+                        endpoint: coordinator.getEndpoint(1),
+                        name: 'Coordinator',
                     };
+                } else {
+                    const device = await this.herdsman.getDeviceByIeeeAddr(key);
+                    if (device) {
+                        const mapped = await zigbeeHerdsmanConverters.findByDevice(device);
+                        const endpoints = mapped && mapped.endpoint ? mapped.endpoint(device) : null;
+                        let endpoint;
+                        if (endpoints && ep != undefined && endpoints[ep]) {
+                            endpoint = device.getEndpoint(endpoints[ep]);
+                        } else if (endpoints && endpoints['default']) {
+                            endpoint = device.getEndpoint(endpoints['default']);
+                        } else {
+                            const epNum = parseInt(ep);
+                            if (!isNaN(epNum)) {
+                                endpoint = device.getEndpoint(epNum);
+                            } else {
+                                endpoint = device.endpoints[0];
+                            }
+                        }
+                        return {
+                            type: 'device',
+                            device,
+                            mapped,
+                            endpoint,
+                            endpoints: device.endpoints,
+                            name: key,
+                        };
+                    }
+                }
+            } else if (typeof key === 'number') {
+                let group = await this.herdsman.getGroupByID(key);
+                if (!group) group = await this.herdsman.createGroup(key);
+                group.toZigbee = groupConverters;
+                group.model = 'group';
+                return {
+                    type: 'group',
+                    mapped: group,
+                    group,
+                    name: `Group ${key}`,
+                };
+            } else {
+                let mapped;
+                try {
+                    mapped = await zigbeeHerdsmanConverters.findByDevice(key);
+                } catch (err) {
+                    this.error(`zigbeeHerdsmanConverters findByDevice ${key.ieeeAddr}`);
                 }
-            }
-        } else if (typeof key === 'number') {
-            let group = await this.herdsman.getGroupByID(key);
-            if (!group) group = await this.herdsman.createGroup(key);
-            group.toZigbee = groupConverters;
-            group.model = 'group';
-            return {
-                type: 'group',
-                mapped: group,
-                group,
-                name: `Group ${key}`,
-            };
-        } else {
-            let mapped;
-            try {
-                mapped = await zigbeeHerdsmanConverters.findByDevice(key);
-            } catch (err) {
-                this.error(`zigbeeHerdsmanConverters findByDevice ${key.ieeeAddr}`);
-            }
 
-            return {
-                type: 'device',
-                device: key,
-                mapped: mapped,
-                name: key.type === 'Coordinator' ? 'Coordinator' : key.ieeeAddr,
-            };
+                return {
+                    type: 'device',
+                    device: key,
+                    mapped: mapped,
+                    name: key.type === 'Coordinator' ? 'Coordinator' : key.ieeeAddr,
+                };
+            }
         }
+        catch {
+            return undefined;
+        }
+
     }
 
     async incMsgHandler(message) {
-        this.debug('incoming msg', message);
-        const device = await this.herdsman.getDeviceByIeeeAddr(message.srcaddr);
-        if (!device) {
-            this.debug('Message without device!');
-            return;
+        try {
+            this.debug('incoming msg', message);
+            const device = await this.herdsman.getDeviceByIeeeAddr(message.srcaddr);
+            if (!device) {
+                this.debug('Message without device!');
+                return;
+            }
+            // We can't handle devices without modelId.
+            if (!device.modelId) {
+                this.debug('Message without modelId!');
+                return;
+            }
+            this.event('msg', device.ieeeAddr, message, {
+                modelId: device.modelId
+            });
         }
-        // We can't handle devices without modelId.
-        if (!device.modelId) {
-            this.debug('Message without modelId!');
+        catch {
             return;
         }
-        this.event('msg', device.ieeeAddr, message, {
-            modelId: device.modelId
-        });
     }
 
     // Stop controller
@@ -814,39 +849,45 @@ class ZigbeeController extends EventEmitter {
         if (cfg == null) {
             cfg = {};
         }
-
-        if (type === 'foundation') {
-            cfg.disableDefaultResponse = true;
-
-            if (cmd === 'read' && !Array.isArray(zclData)) {
-                /*                // needs to be iterable (string[] | number [])
-                zclData[Symbol.iterator] = function* () {
-                    let k;
-                    for (k in this) {
-                        yield k;
-                    }
-                };
-*/
-            }
-            let result;
-            if (cmd === 'configReport') {
-                result = await endpoint.configureReporting(cid, zclData, cfg);
+        try {
+            if (type === 'foundation') {
+                cfg.disableDefaultResponse = true;
+                /*
+                if (cmd === 'read' && !Array.isArray(zclData)) {
+                    // needs to be iterable (string[] | number [])
+                    zclData[Symbol.iterator] = function* () {
+                        let k;
+                        for (k in this) {
+                            yield k;
+                        }
+                    };
+                }
+                */
+                let result;
+                if (cmd === 'configReport') {
+                    result = await endpoint.configureReporting(cid, zclData, cfg);
+                } else {
+                    if (cmd === 'read' && !Array.isArray(zclData))
+                        result = await endpoint[cmd](cid, Object.keys(zclData), cfg);
+                    else
+                        result = await endpoint[cmd](cid, zclData, cfg);
+                }
+                callback && callback(undefined, result);
+            } else if (type === 'functionalResp') {
+                cfg.disableDefaultResponse = false;
+                const result = await endpoint.commandResponse(cid, cmd, zclData, cfg, zclSeqNum);
+                callback && callback(undefined, result);
             } else {
-                if (cmd === 'read' && !Array.isArray(zclData))
-                    result = await endpoint[cmd](cid, Object.keys(zclData), cfg);
-                else
-                    result = await endpoint[cmd](cid, zclData, cfg);
+                cfg.disableDefaultResponse = false;
+                const result = await endpoint.command(cid, cmd, zclData, cfg);
+                callback && callback(undefined, result);
             }
-            callback && callback(undefined, result);
-        } else if (type === 'functionalResp') {
-            cfg.disableDefaultResponse = false;
-            const result = await endpoint.commandResponse(cid, cmd, zclData, cfg, zclSeqNum);
-            callback && callback(undefined, result);
-        } else {
-            cfg.disableDefaultResponse = false;
-            const result = await endpoint.command(cid, cmd, zclData, cfg);
-            callback && callback(undefined, result);
         }
+        catch (error)
+        {
+            this.log.error(`error sending ${type} ${cmd} to endpoint: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`)
+        }
+
     }
 
     async addDevToGroup(devId, groupId, epid) {
@@ -894,7 +935,7 @@ class ZigbeeController extends EventEmitter {
         } catch (error) {
             this.sendError(error);
             this.error(`Exception when trying to Add ${devId}  to group ${groupId}`, error);
-            return {error: `Failed to add ${devId}  to group ${groupId}: ${JSON.stringify(error)}`};
+            return {error: `Failed to add ${devId}  to group ${groupId}: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`};
         }
         return {};
     }
@@ -957,16 +998,21 @@ class ZigbeeController extends EventEmitter {
         target = !target ? this.getCoordinator() : target;
 
         this.debug(`Binding ${log}`);
-        ep.bind(cluster, target, error => {
-            if (error) {
-                this.sendError(error);
-                this.error(`Failed to bind ${log} - (${error})`);
-            } else {
-                this.debug(`Successfully bound ${log}`);
-            }
+        try {
+            ep.bind(cluster, target, error => {
+                if (error) {
+                    this.sendError(error);
+                    this.error(`Failed to bind ${log} - (${error})`);
+                } else {
+                    this.debug(`Successfully bound ${log}`);
+                }
 
+                callback(error);
+            });
+        }
+        catch (error) {
             callback(error);
-        });
+        }
     }
 
     unbind(ep, cluster, target, callback) {
@@ -974,15 +1020,21 @@ class ZigbeeController extends EventEmitter {
         target = !target ? this.getCoordinator() : target;
 
         this.debug(`Unbinding ${log}`);
-        ep.unbind(cluster, target, (error) => {
-            if (error) {
-                this.error(`Failed to unbind ${log} - (${error})`);
-            } else {
-                this.debug(`Successfully unbound ${log}`);
-            }
+        try {
+            ep.unbind(cluster, target, (error) => {
+                if (error) {
+                    this.error(`Failed to unbind ${log} - (${error})`);
+                } else {
+                    this.debug(`Successfully unbound ${log}`);
+                }
 
+                callback(error);
+            });
+        }
+        catch (error)
+        {
             callback(error);
-        });
+        }
     }
 
     reset(mode, callback) {

package/main.js

@@ -441,7 +441,7 @@ class Zigbee extends utils.Adapter {
 
                             Promise.all(chain)
                                 .then(() =>
-                                    this.stController.deleteDeviceStates(devId, () =>
+                                    this.stController.deleteObj(devId, () =>
                                         this.stController.updateDev(devId, model, model, async () => {
                                             await this.stController.syncDevStates(device, model);
                                             resolve();
@@ -467,7 +467,9 @@ class Zigbee extends utils.Adapter {
         const devId = device.ieeeAddr.substr(2);
         const meta = {device};
 
-        if (this.stController.checkDebugDevice(devId)) {
+        const has_elevated_debug = this.stController.checkDebugDevice(devId);
+
+        if (has_elevated_debug) {
             const shortMessage = {};
             for(const propertyName in message) {
                 shortMessage[propertyName] = message[propertyName];
@@ -475,7 +477,7 @@ class Zigbee extends utils.Adapter {
             shortMessage.device = device.ieeeAddr;
             shortMessage.meta = undefined;
             shortMessage.endpoint = (message.endpoint.ID ? message.endpoint.ID: -1);
-            this.log.warn(`ELEVATED: Zigbee Event of Type ${type} from device ${safeJsonStringify(device.ieeeAddr)}, incoming event: ${safeJsonStringify(shortMessage)}`);
+            this.log.warn(`ELEVATED I0: Zigbee Event of Type ${type} from device ${safeJsonStringify(device.ieeeAddr)}, incoming event: ${safeJsonStringify(shortMessage)}`);
         }
         // this assigment give possibility to use iobroker logger in code of the converters, via meta.logger
         meta.logger = this.log;
@@ -558,6 +560,8 @@ class Zigbee extends utils.Adapter {
         if (!converters.length) {
             if (type !== 'readResponse') {
                 this.log.debug(`No converter available for '${mappedModel.model}' '${devId}' with cluster '${cluster}' and type '${type}'`);
+                if (has_elevated_debug)
+                    this.log.warn(`ELEVATED IE0: No converter available for '${mappedModel.model}' '${devId}' with cluster '${cluster}' and type '${type}'`);
             }
             return;
         }
@@ -625,7 +629,14 @@ class Zigbee extends utils.Adapter {
         let isGroup = false;
         const has_elevated_debug = this.stController.checkDebugDevice(deviceId)
 
-        this.log.debug(`publishFromState : ${deviceId} ${model} ${safeJsonStringify(stateList)}`);
+        if (has_elevated_debug)
+        {
+            const stateNames = [];
+            stateList.forEach( state => stateNames.push(state.id));
+            this.log.warn(`ELEVATED O03: Publishing to ${deviceId} of model ${model} ${stateNames.join(', ')}`);
+        }
+        else
+            this.log.debug(`publishFromState : ${deviceId} ${model} ${safeJsonStringify(stateList)}`);
         if (model === 'group') {
             isGroup = true;
             deviceId = parseInt(deviceId);
@@ -633,13 +644,11 @@ class Zigbee extends utils.Adapter {
         try {
             const entity = await this.zbController.resolveEntity(deviceId);
 
-            this.log.debug(`entity: ${deviceId} ${model} ${safeJsonStringify(entity)}`);
-
-            const mappedModel = entity.mapped;
+            const mappedModel = (entity ? entity.mapped : undefined);
 
             if (!mappedModel) {
-                this.log.debug(`No mapped model for ${model}`);
-                if (has_elevated_debug) this.log.warn(`ELEVATED: No mapped model for ${model}`)
+                this.log.debug(`No mapped model for ${deviceId} (model ${model})`);
+                if (has_elevated_debug) this.log.error(`ELEVATED OE01: No mapped model ${deviceId} (model ${model})`)
                 return;
             }
 
@@ -678,25 +687,34 @@ class Zigbee extends utils.Adapter {
                     // on activation of the 'device_query' state trigger hardware query where possible
                     if (stateDesc.id === 'device_query') {
                         if (this.query_device_block.indexOf(deviceId) > -1) {
-                            this.log.warn(`Device query for '${entity.device.ieeeAddr}' blocked`);
+                            this.log.info(`Device query for '${entity.device.ieeeAddr}' blocked`);
                             return;
                         }
                         if (mappedModel) {
                             this.query_device_block.push(deviceId);
-                            this.log.debug(`Device query for '${entity.device.ieeeAddr}' started`);
+                            if (has_elevated_debug)
+                                this.log.warn(`ELEVATED O06: Device query for '${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID}' triggered`);
+                            let t;
                             for (const converter of mappedModel.toZigbee) {
                                 if (converter.hasOwnProperty('convertGet')) {
                                     for (const ckey of converter.key) {
                                         try {
-                                            await converter.convertGet(entity.device.endpoints[0], ckey, {});
+                                            await converter.convertGet(entity.device.endpoints[0], ckey, {endpoint_name:entity.device.endpoints[0].ID.toString()});
                                         } catch (error) {
-                                            this.log.warn(`Failed to read state '${JSON.stringify(ckey)}'of '${entity.device.ieeeAddr}' after query with '${JSON.stringify(error)}'`);
-
+                                            if (has_elevated_debug) {
+                                                this.log.warn(`ELEVATED OE02.1 Failed to read state '${JSON.stringify(ckey)}'of '${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID}' from query with '${error && error.message ? error.message : 'no error message'}`);
+                                            }
+                                            else
+                                                this.log.info(`failed to read state ${JSON.stringify(ckey)} of ${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID} after device query`);
                                         }
                                     }
                                 }
                             }
-                            this.log.debug(`Device query for '${entity.device.ieeeAddr}' done`);
+                            if (has_elevated_debug)
+                                this.log.warn(`ELEVATED O07: Device query for '${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID}' complete`);
+                            else
+                                this.log.info(`Device query for '${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID}' complete`);
+
                             const idToRemove = deviceId;
                             setTimeout(() => {
                                 const idx = this.query_device_block.indexOf(idToRemove);
@@ -711,30 +729,35 @@ class Zigbee extends utils.Adapter {
                 }
 
                 let converter = undefined;
+                let msgCnt = 1;
                 for (const c of mappedModel.toZigbee) {
 
                     if (!c.hasOwnProperty('convertSet')) continue;
                     this.log.debug(`Type of toZigbee is '${typeof c}', Contains key ${(c.hasOwnProperty('key')?JSON.stringify(c.key):'false ')}`)
-                    if (!c.hasOwnProperty('key') && c.hasOwnProperty('convertSet') && converter === undefined)
+                    if (!c.hasOwnProperty('key'))
                     {
-                        converter = c;
-
-                        if (has_elevated_debug) this.log.warn(`ELEVATED: setting converter to keyless converter for ${deviceId} of type ${model}`)
-                        this.log.debug('setting converter to keyless converter')
+                        if (c.hasOwnProperty('convertSet') && converter === undefined)
+                        {
+                            converter = c;
+                            if (has_elevated_debug) {
+                                this.log.warn(`ELEVATED O4.${msgCnt++}: Setting converter to keyless converter for ${deviceId} of type ${model}`)
+                            }
+                            this.log.debug('setting converter to keyless converter')
+                        }
+                        else
+                        {
+                            if (has_elevated_debug) this.log.warn(`ELEVATED O4.${msgCnt++}: ignoring keyless converter for ${deviceId} of type ${model}`)
+                            this.log.debug('ignoring keyless converter')
+                        }
                         continue;
                     }
                     if (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id))
                     {
                         this.log.debug(`${(converter===undefined?'Setting':'Overriding')}' converter to converter with key(s)'${JSON.stringify(c.key)}}`)
-                        if (has_elevated_debug) this.log.warn(`ELEVATED: ${(converter===undefined?'Setting':'Overriding')}' converter to converter with key(s)'${JSON.stringify(c.key)}}`)
+                        if (has_elevated_debug) this.log.warn(`ELEVATED O4.${msgCnt++}: ${(converter===undefined?'Setting':'Overriding')}' converter to converter with key(s)'${JSON.stringify(c.key)}}`)
                         converter = c;
                     }
-
                 }
-                /*
-                if (!mappedModel.toZigbee[0].hasOwnProperty('key') && mappedModel.toZigbee[0].hasOwnProperty('convertSet')) converter = mappedModel.toZigbee[0];
-                converter = mappedModel.toZigbee.find(c => c && c.hasOwnProperty('key') && (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id)));
-*/
                 if (converter === undefined) {
                     this.log.error(`No converter available for '${model}' with key '${stateDesc.id}' `);
                     this.sendError(`No converter available for '${model}' with key '${stateDesc.id}' `);
@@ -755,9 +778,9 @@ class Zigbee extends utils.Adapter {
                 }
 
                 const epName = stateDesc.epname !== undefined ? stateDesc.epname : (stateDesc.prop || stateDesc.id);
-                const key = stateDesc.prop || stateDesc.id || stateDesc.setattr;
+                const key = stateDesc.setattr || stateDesc.prop || stateDesc.id;
                 this.log.debug(`convert ${key}, ${safeJsonStringify(preparedValue)}, ${safeJsonStringify(preparedOptions)}`);
-                if (has_elevated_debug) this.log.warn(`ELEVATED: convert ${key}, ${safeJsonStringify(preparedValue)}, ${safeJsonStringify(preparedOptions)} for device ${deviceId}`);
+                if (has_elevated_debug) this.log.warn(`ELEVATED O4: convert ${key}, ${safeJsonStringify(preparedValue)}, ${safeJsonStringify(preparedOptions)} for device ${deviceId} with Endpoint ${epName}`);
 
                 let target;
                 if (model === 'group') {
@@ -797,30 +820,27 @@ class Zigbee extends utils.Adapter {
                 try {
                     const result = await converter.convertSet(target, key, preparedValue, meta);
                     this.log.debug(`convert result ${safeJsonStringify(result)}`);
-                    if (has_elevated_debug) this.log.warn(`ELEVATED: convert result ${safeJsonStringify(result)} for device ${deviceId}`);
+                    if (has_elevated_debug) this.log.warn(`ELEVATED O05: convert result ${safeJsonStringify(result)} sent to device ${deviceId}`);
                     if (result !== undefined) {
                         if (stateModel && !isGroup) {
                             this.acknowledgeState(deviceId, model, stateDesc, value);
                         }
                         // process sync state list
                         this.processSyncStatesList(deviceId, model, syncStateList);
-
-                        //                        if (isGroup) {
-                        //                            await this.callPluginMethod('queryGroupMemberState', [deviceId, stateDesc]);
-                        //                            this.acknowledgeState(deviceId, model, stateDesc, value);
-                        //                        }
                     }
                     else
-                        if (has_elevated_debug) this.log.warn(`Error convert result for ${key} with ${safeJsonStringify(preparedValue)} is undefined on device ${deviceId}.`);
+                        if (has_elevated_debug)
+                            this.log.error(`ELEVATED OE2: Error convert result for ${key} with ${safeJsonStringify(preparedValue)} is undefined on device ${deviceId}.`);
 
                 } catch (error) {
-                    if (has_elevated_debug) this.log.warn(`caught error ${safeJsonStringify(error)} is undefined on device ${deviceId}.`);
+                    if (has_elevated_debug)
+                        this.log.error(`ELEVATED OE3: caught error ${safeJsonStringify(error)} when setting value for device ${deviceId}.`);
                     this.filterError(`Error ${error.code} on send command to ${deviceId}.` +
                         ` Error: ${error.stack}`, `Send command to ${deviceId} failed with`, error);
                 }
             });
         } catch (err) {
-            this.log.error(`No entity for ${deviceId}`);
+            this.log.error(`No entity for ${deviceId} : ${err && err.message ? err.message : ''}`);
         }
     }
 
@@ -934,7 +954,7 @@ class Zigbee extends utils.Adapter {
         if (ieeeAddr) {
             const devId = ieeeAddr.substr(2);
             this.log.debug(`Delete device ${devId} from iobroker.`);
-            this.stController.deleteDeviceStates(devId);
+            this.stController.deleteObj(devId);
         }
     }