iobroker.zigbee 1.6.3 → 1.6.14

package/lib/devices.js

@@ -730,6 +730,7 @@ const devices = [
         states: [states.contact, states.opened, states.voltage, states.battery],
     },
     {
+        // MCCGQ14LM is a opple brand. not works here
         models: ['MCCGQ11LM'],
         icon: 'img/sensor_magnet_aq2.png',
         states: [states.contact, states.opened, states.voltage, states.battery],
@@ -2327,6 +2328,12 @@ const devices = [
         icon: 'img/nue_hgzb-02a.png',
         states: [states.state],
     },
+    {
+        models: ['HGZB-02A'],
+        icon: 'img/nue_hgzb-02a.png',
+        states: lightStates,
+        linkedStates: [comb.brightnessAndState],
+    },
     {
         models: ['HGZB-41', 'HGZB-20-UK'],
         icon: 'img/nue_switch_single.png',
@@ -3036,7 +3043,45 @@ const devices = [
         icon: 'img/ICZB-RM11S.png',
         states: generator.icasa_remote,
     },
-
+   
+ /*    images only for admin                */   
+    {
+        models: ['E1812'],
+        icon: 'img/ikea_E1812.png',
+    },   
+    {   
+        models: ['WHD02'],
+        icon: 'img/WHD02.png',
+    },
+    {   
+        models: ['R7060'],
+        icon: 'img/R7060.png',
+    },
+    {   
+        models: ['929001821618'],
+        icon: 'img/philips_hue_ambiance.png',
+    },
+    {   
+        models: ['14153905L'],
+        icon: 'img/14153905L.png',
+    },
+    {   
+        models: ['HG06338'],
+        icon: 'img/HG06338.png',
+    },
+    {
+        models: ['81855'],
+        icon: 'img/81855.png',
+    },
+    {
+        models: ['TI0001-cover'],
+		icon: 'img/TI0001-cover.png',
+    },
+    {	
+        models: ['E1603/E1702/E1708'],
+        icon: 'img/ikea_control_outlet.png',
+    },
+    
 ];
 
 const commonStates = [

package/lib/exposes.js

@@ -116,10 +116,12 @@ function createFromExposes(model, def) {
     //      .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;
         }
+        if (access === undefined) access = ea.ALL;
         state.readable = (access & ea.STATE) > 0;
         state.writable = (access & ea.SET) > 0;
         const stateExists = states.findIndex( (element, index, array) => (element.id === state.id ));
@@ -758,7 +760,7 @@ function createFromExposes(model, def) {
     };
     // make the function code printable in log
     //console.log(`Created mapping for device ${model}: ${JSON.stringify(newDev, function(key, value) {
-    //  if (typeof value === 'function') {return value.toString() } else { return value } }, ' ')}`); 
+    //  if (typeof value === 'function') {return value.toString() } else { return value } }, ' ')}`);
     return newDev;
 }
 

package/lib/groups.js

@@ -15,7 +15,11 @@ class Groups {
         this.adapter.getStateAsync('info.groups')
             .then((groupsState) => {
                 const groups = (groupsState && groupsState.val) ? JSON.parse(groupsState.val) : {};
-                this.syncGroups(groups);
+                for (const gid in groups) {
+                    stController.storeDeviceName(`group_${gid}`, groups[gid]);
+                }
+//                this.Adapter.deleteState('info.groups');
+                this.syncGroups();
             });
     }
 
@@ -90,16 +94,17 @@ class Groups {
     async getGroups(obj) {
         const response = { groups: {} };
         try {
-            const groupsState = await this.adapter.getStateAsync('info.groups');
+//            const groupsState = await this.adapter.getStateAsync('info.groups');
             const herdsmanGroups = await this.zbController.getGroups();
 
-            const groups = (groupsState && groupsState.val) ? JSON.parse(groupsState.val) : {};
+//            const groups = (groupsState && groupsState.val) ? JSON.parse(groupsState.val) : {};
 
+            const groups = {};
             if (typeof herdsmanGroups === 'object') {
                 for (const group of herdsmanGroups) {
                     const gid = group.groupID;
-                    if (gid && groups[gid]=== undefined) {
-                        groups[gid] = `Auto Group ${gid}`;
+                    if (gid) {
+                        groups[gid]=this.stController.verifyDeviceName(`group_${gid}`,`Group ${gid}`);
                     }
                 }
             }
@@ -115,34 +120,44 @@ class Groups {
                 this.adapter.sendTo(obj.from, obj.command, response, obj.callback);
 
         }
+        return response.groups;
     }
 
     async updateGroupMembership(from, command, message, callback) {
         try {
-            const groups = (message && message.groups ? message.groups : []);
+            const groups = (message && message.groups ? message.groups : {});
             const devId = (message && message.id ? message.id : undefined);
             if (devId === undefined) {
                 this.adapter.sendTo(from, command, {error: 'No device specified'}, callback);
             }
             const sysid = devId.replace(this.adapter.namespace + '.', '0x');
-            const id = `${devId}.groups`;
+            // Keeping this for reference. State update or state removal needs to be decided upon
+            //const id = `${devId}.groups`;
+            // this.adapter.setState(id, JSON.stringify(groups), true);
 
-            this.adapter.setState(id, JSON.stringify(groups), true);
-            let response = await this.zbController.removeDevFromAllGroups(sysid);
-            if (response && response.error)
-            {
-                this.adapter.sendTo(from, command, response, callback);
-                return;
-            }
-            for (const groupId of groups) {
-                response = await this.zbController.addDevToGroup(sysid, parseInt(groupId));
-                if (response && response.error)
-                {
-                    this.adapter.sendTo(from, command, response, callback);
-                    return;
+            //const current = await this.zbController.getGroupMembersFromController(sysid);
+            const errors = []
+            for (const epid in groups) {
+                for (const gpid of groups[epid]) {
+                    const gpidn = parseInt(gpid);
+                    if (gpidn < 0) {
+                        let response = await this.zbController.removeDevFromGroup(sysid,(-gpidn), epid);
+                        if (response && response.error) {
+                            errors.push(response.error);
+                            this.error("remove dev from group Error: "+ JSON.stringify(response.error));
+                        }
+                    }
+                    else if (gpidn > 0){
+                        let response = await this.zbController.addDevToGroup(sysid,(gpidn), epid);
+                        if (response && response.error) {
+                            errors.push(response.error);
+                            this.error("add dev to group Error: "+ JSON.stringify(response.error));
+                        }
+
+                    }
+                    else this.warn('illegal group id 0');
                 }
             }
-
         } catch (e) {
             this.adapter.sendTo(from, command, {error: e}, callback);
             return;
@@ -177,7 +192,6 @@ class Groups {
             }
         }
         if (result.unsupported.length>0) {
-            // this.warn('unsupported ' + stateDesc.id + ' change for group members ' + JSON.stringify(result.unsupported));
             const error = {
                 code: 134,
                 message: `unsupported ${stateDesc.id} change for group members ${result.unsupported.join()}`
@@ -190,6 +204,7 @@ class Groups {
     }
 
     async deleteGroup(from, command, message) {
+/*
         const members = await this.getGroupMembersFromController(parseInt(message));
         if (members && members.length) {
             for (const member of members) {
@@ -212,17 +227,27 @@ class Groups {
         const objGroups = (groupsEntry && groupsEntry.val ? JSON.parse(groupsEntry.val) : {});
         delete objGroups[message.toString()];
         await this.adapter.setStateAsync('info.groups', JSON.stringify(objGroups), true);
+*/
         await this.zbController.removeGroupById(message);
-        this.stController.deleteDeviceStates(`group_${parseInt(message)}`);
+        await this.stController.deleteDeviceStatesAsync(`group_${parseInt(message)}`);
     }
 
     async renameGroup(from, command, message) {
-        const groupsEntry = await this.adapter.getStateAsync('info.groups');
-        const objGroups = (groupsEntry && groupsEntry.val ? JSON.parse(groupsEntry.val) : {});
+
+//        const groupsEntry = await this.adapter.getStateAsync('info.groups');
+//        const objGroups = (groupsEntry && groupsEntry.val ? JSON.parse(groupsEntry.val) : {});
         const name = message.name;
         const id = `group_${message.id}`;
-        objGroups[message.id.toString()] = message.name;
-        await this.adapter.setStateAsync('info.groups', JSON.stringify(objGroups), true);
+        this.stController.storeDeviceName(id, name);
+        try {
+          await this.zbController.verifyGroupExists(message.id);
+        }
+        catch (e)
+        {
+          if (e && e.hasOwnProperty('code')) this.warn('renameGroup caught error ' + JSON.stringify(e.code));
+        }
+//        objGroups[message.id.toString()] = message.name;
+//        await this.adapter.setStateAsync('info.groups', JSON.stringify(objGroups), true);
 
         const group = await this.adapter.getStateAsync(id);
         if (!group) {
@@ -255,7 +280,8 @@ class Groups {
     }
 
 
-    syncGroups(groups) {
+    async syncGroups() {
+        const groups = await this.getGroups();
         const chain = [];
         const usedGroupsIds = [];
         for (const j in groups) {

package/lib/ota.js

@@ -62,6 +62,20 @@ class Ota {
             this.warn(`Update or check already in progress for '${device.name}', skipping...`);
             return;
         }
+        // do not attempt update for a device which has been deactivated or is unavailable
+        const stateObj = await this.adapter.getObjectAsync(obj.message.devId);
+        if (stateObj && stateObj.common && stateObj.common.deactivated) {
+          this.warn(`Device ${obj.message.devId} is deactivated, skipping...`);
+          this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is deactivated'}, obj.callback);
+          return;
+        }
+        const availablestate = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.available');
+        const lqi = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.link_quality');
+        if ((availablestate && (!availablestate.val)) || (lqi && lqi.val < 1)) {
+          this.warn(`Device ${obj.message.devId} is marked unavailable, skipping...`);
+          this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is marked unavailable'}, obj.callback);
+          return;
+        }
         this.inProgress.add(device.device.ieeeAddr);
         const result = {status: 'unknown', device: device ? device.name : null};
         try {
@@ -96,6 +110,18 @@ class Ota {
             this.error(`Update or check already in progress for '${device.name}', skipping...`);
             return;
         }
+        // do not attempt update for a device which has been deactivated or is unavailable
+        const stateObj = await this.adapter.getObjectAsync(obj.message.devId);
+        if (stateObj && stateObj.common && stateObj.common.deactivated) {
+          this.warn(`Device ${obj.message.devId} is deactivated, skipping...`);
+          return;
+        }
+        const availablestate = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.available');
+        const lqi = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.link_quality');
+        if ((availablestate && (!availablestate.val)) || (lqi && lqi.val < 1)) {
+          this.warn(`Device ${obj.message.devId} is marked unavailable, skipping...`);
+          return;
+        }
         this.inProgress.add(device.device.ieeeAddr);
         const result = {status: 'unknown', device: device ? device.name : null};
         try {

package/lib/rgb.js

@@ -212,14 +212,44 @@ function colorArrayFromString(value) {
     return [{r:0,g:128,b:255}];
 }
 
+function colorStringFromRGBArray(payload)
+{
+    let rv = []
+    payload.forEach(element => {
+        rv.push(rgb_to_rgbstring(element));
+    });
+    return rv.toString();
+}
+
 function hsv_to_cie(h,s,v){
     const rgb = hsvToRGB(h,s,v);
     return rgb_to_cie(rgb.r, rgb.g, rgb.b);
 }
 
+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';
+    if (element && element.hasOwnProperty("g"))
+      col = col + element.g.toString(16).padStart(2, '0');
+    else col = col + '00';
+    if (element && element.hasOwnProperty("b"))
+      col = col + element.b.toString(16).padStart(2, '0');
+    else col = col + '00';
+    return col;
+}
+
+
+function hsvToRGBString(h,s,v) {
+    return rgb_to_rgbstring(hsvToRGB(h,s,v))
+}
+
 exports.hsv_to_cie = hsv_to_cie;
 exports.rgb_to_cie = rgb_to_cie;
 exports.cie_to_rgb = cie_to_rgb;
 exports.hsvToRGB = hsvToRGB;
 exports.rgbToHSV = rgbToHSV;
 exports.colorArrayFromString = colorArrayFromString;
+exports.colorStringFromRGBArray = colorStringFromRGBArray;
+exports.hsvToRGBString = hsvToRGBString;

package/lib/states.js

@@ -60,7 +60,7 @@ const unitLookup = {
 const timers = {};
 
 const states = {
-    groups: {
+/*    groups: {
         id: 'groups',
         name: 'Groups',
         icon: undefined,
@@ -70,6 +70,7 @@ const states = {
         type: 'string',
         isOption: true,
     },
+*/
     link_quality: {
         id: 'link_quality',
         prop: 'linkquality',
@@ -4547,10 +4548,11 @@ const states = {
         name: 'Button ROW 2',
         icon: undefined,
         role: 'button',
-        write: false,
+        write: true,
         read: true,
         type: 'boolean',
         getter: payload => (payload.action === 'row_2_on') ? true : (payload.action === 'row_2_off') ? false : undefined,
+        setter: (value) => (value) ? 'row_2_on' : 'row_2_off',
     },
     rm01_row_3: {
         id: 'rm01_row_3',
@@ -4558,10 +4560,11 @@ const states = {
         name: 'Button ROW 3',
         icon: undefined,
         role: 'button',
-        write: false,
+        write: true,
         read: true,
         type: 'boolean',
         getter: payload => (payload.action === 'row_3_on') ? true : (payload.action === 'row_3_off') ? false : undefined,
+        setter: (value) => (value) ? 'row_3_on' : 'row_3_off',
     },
     rm01_row_4: {
         id: 'rm01_row_4',
@@ -4569,10 +4572,11 @@ const states = {
         name: 'Button ROW 4',
         icon: undefined,
         role: 'button',
-        write: false,
+        write: true,
         read: true,
         type: 'boolean',
         getter: payload => (payload.action === 'row_4_on') ? true : (payload.action === 'row_4_off') ? false : undefined,
+        setter: (value) => (value) ? 'row_4_on' : 'row_4_off',
     },
     left_top_click: {
         id: 'left_top_click',
@@ -5800,16 +5804,21 @@ const states = {
                 speed:10,
                 effect:'glow',
             };
-            if (options.hasOwnProperty('effect_speed'))
+            if (options && options.hasOwnProperty('effect_speed'))
                 effectjson.speed = options.effect_speed;
-            if (options.hasOwnProperty('effect_colors'))
+            if (options && options.hasOwnProperty('effect_colors'))
             {
                 effectjson.colors = rgb.colorArrayFromString(options.effect_colors);
             }
             effectjson.effect = value;
             return effectjson;
+        },
+        getter: (payload) => {
+            if (payload && payload.effect && payload.effect.hasOwnProperty('effect')) return payload.effect.effect;
+            return "steady";
         }
-    },
+
+     },
     effect_json: {
         id: 'effect_json',
         name: 'Effect',
@@ -5829,11 +5838,11 @@ const states = {
                     speed:10,
                     effect:'glow',
                 };
-                if (options.hasOwnProperty('effect_speed'))
+                if (options && options.hasOwnProperty('effect_speed'))
                     effectjson.speed = options.effect_speed;
-                if (options.hasOwnProperty('effect_colors'))
+                if (options && options.hasOwnProperty('effect_colors'))
                     effectjson.colors = rgb.colorArrayFromString(options.effect_colors);
-                if (options.hasOwnProperty('effect_type'))
+                if (options && options.hasOwnProperty('effect_type'))
                     effectjson.effect = options.effect_type;
                 value = JSON.stringify(effectjson);
                 return effectjson;
@@ -5859,12 +5868,16 @@ const states = {
                 speed:10,
                 effect:'snake',
             };
-            if (options.hasOwnProperty('effect_type'))
+            if (options && options.hasOwnProperty('effect_type'))
                 effectjson.effect = options.effect_type;
-            if (options.hasOwnProperty('effect_colors'))
+            if (options && options.hasOwnProperty('effect_colors'))
                 effectjson.colors = rgb.colorArrayFromString(options.effect_colors);
             effectjson.speed = value;
             return effectjson;
+        },
+        getter: (payload) => {
+            if (payload && payload.effect && payload.effect.hasOwnProperty('speed')) return payload.effect.speed;
+            return 1;
         }
     },
 
@@ -5885,12 +5898,16 @@ const states = {
                 effect:'sparkle',
             };
 
-            if (options.hasOwnProperty('effect_speed'))
+            if (options && options.hasOwnProperty('effect_speed'))
                 effectjson.speed = options.effect_speed;
-            if (options.hasOwnProperty('effect_type'))
+            if (options && options.hasOwnProperty('effect_type'))
                 effectjson.effect = options.effect_type;
             effectjson.colors = rgb.colorArrayFromString(value);
             return effectjson;
+        },
+        getter: (payload) => {
+            if (payload && payload.effect && payload.effect.hasOwnProperty('colors')) return rgb.colorStringFromRGBArray(payload.effect.colors);
+            return '#ffff00,#ff00ff,#00ffff,#0000ff,#00ff00,#ff0000';
         }
     },
 
@@ -5925,6 +5942,15 @@ const states = {
 
             };
         },
+        getter: (payload) => {
+            if (payload.color) {
+                const c = payload.color;
+                if (c.hasOwnProperty("h") && c.hasOwnProperty("s") && c.hasOwnProperty("b"))
+                  return rgb.hsvToRGBString(c.h, c.s, c.b * 100 / 255);
+                if (c.hasOwnProperty("h") && c.hasOwnProperty("s") && c.hasOwnProperty("v"))
+                  return rgb.hsvToRGBString(c.h, c.s, c.v * 100);
+            }
+        },
         setterOpt: (value, options) => {
             const hasTransitionTime = options && options.hasOwnProperty('transition_time');
             const transitionTime = hasTransitionTime ? options.transition_time : 0;