iobroker.zigbee 1.6.0 → 1.6.12

package/lib/exposes.js

@@ -76,6 +76,7 @@ function genState(expose, role, name, desc) {
             };
             if (expose.endpoint) {
                 state.epname = expose.endpoint;
+                state.setattr = expose.name;
             }
             break;
 
@@ -115,16 +116,18 @@ 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 ));
         if (stateExists < 0 ) {
+            state.write = state.writable;
             if (! state.writable) {
-                state.write = false;
                 if ( state.hasOwnProperty('setter') ) {
                     delete state.setter;
                 }
@@ -173,7 +176,7 @@ function createFromExposes(model, def) {
                 states[stateExists].readable = true;
             }
             if ( (state.writable) && (! states[stateExists].writable ) ) {
-                states[stateExists].write = state.write;
+                states[stateExists].write = state.writable;
                 // use new state `setter`
                 if ( state.hasOwnProperty('setter') ) {
                     states[stateExists].setter = state.setter;
@@ -214,7 +217,7 @@ function createFromExposes(model, def) {
             return states.length;
         }
     }
-    const icon = `https://www.zigbee2mqtt.io/images/devices/${model.replace(/\//g, '-')}.jpg`;
+    const icon = utils.getDeviceIcon(def);
     for (const expose of def.exposes) {
         let state;
 
@@ -757,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

@@ -115,34 +115,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 +187,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()}`
@@ -255,7 +264,8 @@ class Groups {
     }
 
 
-    syncGroups(groups) {
+    async syncGroups(adapterGroups) {
+        const groups = await this.getGroups();
         const chain = [];
         const usedGroupsIds = [];
         for (const j in groups) {

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

@@ -296,7 +296,7 @@ const states = {
         prop: 'battery',
         name: 'Battery percent',
         icon: 'img/battery_p.png',
-        role: 'battery.percent',
+        role: 'value.battery',
         write: false,
         read: true,
         type: 'number',
@@ -747,7 +747,7 @@ const states = {
         prop: 'battery_low',
         name: 'Battery Status Low',
         icon: undefined,
-        role: 'state',
+        role: 'indicator.lowbat',
         write: false,
         read: true,
         type: 'boolean'
@@ -2139,7 +2139,7 @@ const states = {
         prop: 'local_temperature_calibration',
         name: 'Temperature Calibration',
         icon: undefined,
-        role: 'value.temperature',
+        role: 'level',
         write: true,
         read: true,
         type: 'number',
@@ -2352,7 +2352,7 @@ const states = {
         prop: 'pi_heating_demand',
         name: 'Auto Valve position',
         icon: undefined,
-        role: 'state',
+        role: 'value.valve',
         write: false,
         read: true,
         type: 'number',
@@ -2364,7 +2364,7 @@ const states = {
         prop: 'eurotronic_valve_position',
         name: 'Manual Valve position',
         icon: undefined,
-        role: 'state',
+        role: 'level.valve',
         write: true,
         read: true,
         type: 'number',
@@ -2379,7 +2379,7 @@ const states = {
         prop: 'current_heating_setpoint',
         name: 'Current Target Temperature',
         icon: undefined,
-        role: 'value.temperature',
+        role: 'level.temperature',
         write: true,
         read: true,
         type: 'number',
@@ -2391,10 +2391,10 @@ const states = {
         // 1 = manual valve control
         // 2 = auto (default)
         id: 'spz_trv_mode',
-        name: 'TRV Mode',
+        name: 'TRV Mode (1 = manual | 2 = auto)',
         prop: 'eurotronic_trv_mode',
         icon: undefined,
-        role: 'state',
+        role: 'level',
         write: true,
         read: true,
         type: 'number',
@@ -2411,7 +2411,7 @@ const states = {
         name: 'Thermostat Mode',
         prop: 'eurotronic_system_mode',
         icon: undefined,
-        role: 'state',
+        role: 'level',
         write: true,
         read: true,
         type: 'number',
@@ -2421,7 +2421,7 @@ const states = {
         name: 'Thermostat Error',
         prop: 'eurotronic_error_status',
         icon: undefined,
-        role: 'state',
+        role: 'value',
         write: false,
         read: true,
         type: 'number',
@@ -2431,7 +2431,7 @@ const states = {
         name: 'Window Open / Off',
         prop: 'eurotronic_host_flags',
         icon: undefined,
-        role: 'state',
+        role: 'switch',
         write: true,
         read: true,
         type: 'boolean',
@@ -2450,7 +2450,7 @@ const states = {
         name: 'Boost Mode',
         prop: 'eurotronic_host_flags',
         icon: undefined,
-        role: 'state',
+        role: 'switch.mode.boost',
         write: true,
         read: true,
         type: 'boolean',
@@ -2469,7 +2469,7 @@ const states = {
         name: 'Child Protection',
         prop: 'eurotronic_host_flags',
         icon: undefined,
-        role: 'state',
+        role: 'switch.lock',
         write: true,
         read: true,
         type: 'boolean',
@@ -2488,7 +2488,7 @@ const states = {
         name: 'Mirror Display',
         prop: 'eurotronic_host_flags',
         icon: undefined,
-        role: 'state',
+        role: 'switch',
         write: true,
         read: true,
         type: 'boolean',
@@ -4070,7 +4070,7 @@ const states = {
         prop: 'current_heating_setpoint',
         name: 'Current Target Temperature',
         icon: undefined,
-        role: 'value.temperature',
+        role: 'level.temperature',
         write: true,
         read: true,
         type: 'number',
@@ -4083,7 +4083,7 @@ const states = {
         name: 'Locked',
         prop: 'child_lock',
         icon: undefined,
-        role: 'state',
+        role: 'switch.lock',
         write: true,
         read: true,
         type: 'boolean',
@@ -4095,7 +4095,7 @@ const states = {
         name: 'Window detected',
         prop: 'window_detection',
         icon: undefined,
-        role: 'state',
+        role: 'value',
         write: false,
         read: true,
         type: 'boolean',
@@ -4106,7 +4106,7 @@ const states = {
         name: 'Valve detected',
         prop: 'valve_detection',
         icon: undefined,
-        role: 'state',
+        role: 'value',
         write: false,
         read: true,
         type: 'boolean',
@@ -4117,7 +4117,7 @@ const states = {
         name: 'Auto lock',
         prop: 'auto_lock',
         icon: undefined,
-        role: 'state',
+        role: 'value',
         write: false,
         read: true,
         type: 'boolean',
@@ -4128,7 +4128,7 @@ const states = {
         prop: 'min_temperature',
         name: 'Minimal Temperature',
         icon: undefined,
-        role: 'value.temperature',
+        role: 'level',
         write: true,
         read: true,
         type: 'number',
@@ -4141,7 +4141,7 @@ const states = {
         prop: 'max_temperature',
         name: 'Maximal Temperature',
         icon: undefined,
-        role: 'value.temperature',
+        role: 'level',
         write: true,
         read: true,
         type: 'number',
@@ -4154,7 +4154,7 @@ const states = {
         prop: 'boost_time',
         name: 'Boost time',
         icon: undefined,
-        role: 'state',
+        role: 'level',
         write: true,
         read: true,
         type: 'number',
@@ -4167,7 +4167,7 @@ const states = {
         prop: 'comfort_temperature',
         name: 'Comfort Temperature',
         icon: undefined,
-        role: 'value.temperature',
+        role: 'level',
         write: true,
         read: true,
         type: 'number',
@@ -4180,7 +4180,7 @@ const states = {
         prop: 'eco_temperature',
         name: 'ECO Temperature',
         icon: undefined,
-        role: 'value.temperature',
+        role: 'level',
         write: true,
         read: true,
         type: 'number',
@@ -4193,7 +4193,7 @@ const states = {
         name: 'Mode',
         prop: 'system_mode',
         icon: undefined,
-        role: 'state',
+        role: 'level.mode.thermostat',
         write: true,
         read: true,
         type: 'string', // valid: low, medium, high
@@ -4260,7 +4260,7 @@ const states = {
         prop: 'position',
         name: 'Valve position',
         icon: undefined,
-        role: 'state',
+        role: 'value.valve',
         write: false,
         read: true,
         type: 'number',
@@ -4547,10 +4547,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 +4559,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 +4571,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 +5803,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 +5837,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 +5867,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 +5897,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 +5941,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;