iobroker.zigbee 1.8.3 → 1.8.5

package/lib/devices.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const states = require(__dirname + '/states.js').states;
-const utils = require(__dirname + '/utils.js');
-const rgb = require(__dirname + '/rgb.js');
-const applyExposes = require(__dirname + '/exposes.js').applyExposes;
+const states = require('./states.js').states;
+const utils = require('./utils.js');
+const rgb = require('./rgb.js');
+const applyExposes = require('./exposes.js').applyExposes;
 
 
 // return list of changing states when incoming state is changed
@@ -23,7 +23,7 @@ const comb = {
                         // index: -1, // before main change
                         // timeout: 0,
                         index: 1, // after main change
-                        timeout: timeout,
+                        timeout,
                     }];
                 }
             } else if (disableQueue || options.state) {
@@ -32,7 +32,7 @@ const comb = {
                     stateDesc: states.state,
                     value: false,
                     index: 1, // after main change
-                    timeout: timeout,
+                    timeout,
                 }];
             }
         }
@@ -42,20 +42,21 @@ const comb = {
         if (state.id === states.effect_json.id) {
             const effectjson = {};
             try {
-                if (options.hasOwnProperty('effect_speed'))
+                if (options.hasOwnProperty('effect_speed')) {
                     effectjson.speed = options.effect_speed;
-                if (options.hasOwnProperty('effect_type'))
+                }
+                if (options.hasOwnProperty('effect_type')) {
                     effectjson.effect = options.effect_type;
-
-                if (options.hasOwnProperty('effect_colors'))
+                }
+                if (options.hasOwnProperty('effect_colors')) {
                     effectjson.colors = rgb.colorsArrayFromString(options.effect_colors);
+                }
                 //               effectjson = JSON.parse(value);
-            }
-            catch {
+            } catch {
                 const effectjson = {
-                    colors:[{r: 255,g: 0,b: 0},{r: 0,g: 255,b: 0},{r: 0,g: 0,b: 255}],
-                    speed:10,
-                    effect:'glow',
+                    colors: [{r: 255, g: 0, b: 0}, {r: 0, g: 255, b: 0}, {r: 0, g: 0, b: 255}],
+                    speed: 10,
+                    effect: 'glow',
                 };
                 if (options.hasOwnProperty('effect_speed'))
                     effectjson.speed = options.effect_speed;
@@ -118,11 +119,11 @@ const sync = {
     },
 };
 
-const lightStatesWithColortemp = [states.state, states.brightness, states.colortemp,states.brightness_move, states.colortemp_move, states.transition_time];
-const lightStatesWithColor = [states.state, states.brightness, states.colortemp, states.color,states.brightness_move, states.colortemp_move, states.transition_time];
-const lightStatesWithColor_hue = [states.state, states.brightness, states.colortemp, states.color,states.brightness_move, states.colortemp_move, states.hue_move, states.transition_time, states.effect_type_hue];
+const lightStatesWithColortemp = [states.state, states.brightness, states.colortemp, states.brightness_move, states.colortemp_move, states.transition_time];
+const lightStatesWithColor = [states.state, states.brightness, states.colortemp, states.color, states.brightness_move, states.colortemp_move, states.transition_time];
+const lightStatesWithColor_hue = [states.state, states.brightness, states.colortemp, states.color, states.brightness_move, states.colortemp_move, states.hue_move, states.transition_time, states.effect_type_hue];
 const lightStatesWithColorNoTemp = [states.state, states.brightness, states.color, states.brightness_move, states.transition_time];
-const lightStates = [states.state, states.brightness, states.brightness_move,  states.transition_time];
+const lightStates = [states.state, states.brightness, states.brightness_move, states.transition_time];
 
 const gl_lightStatesWithColor = [states.gl_state, states.gl_brightness, states.gl_colortemp, states.gl_color, states.transition_time];
 const gl_white_channel = [states.white_brightness, states.white_state, states.white_colortemp];
@@ -131,29 +132,30 @@ const freepad_states = [states.battery];
 
 function getKey(object, value) {
     for (const key in object) {
-        if (object[key]==value) return key;
+        if (object[key] == value) {
+            return key;
+        }
     }
 }
 
 const unitLookup = {
     'temperature': 'C',
-    'humidity':'%',
-    'altitude':'m',
-    'pressure':'Pa',
-    'quality':'ppm',
-    'particle_size':'psize',
-    'voltage':'V',
-    'current':'A',
-    'energy':'Wh',
-    'power':'W',
-    'frequency':'Hz',
-    'power_factor':'pf',
-    'illuminance_lux':'lx',
-
+    'humidity': '%',
+    'altitude': 'm',
+    'pressure': 'Pa',
+    'quality': 'ppm',
+    'particle_size': 'psize',
+    'voltage': 'V',
+    'current': 'A',
+    'energy': 'Wh',
+    'power': 'W',
+    'frequency': 'Hz',
+    'power_factor': 'pf',
+    'illuminance_lux': 'lx',
 };
 
 const generator = {
-    gledopto: (entity) => {
+    gledopto: entity => {
         if (entity.mapped.model === 'GL-C-008-2ID') {
             return gl_lightStatesWithColor.concat(gl8_white_channel);
         } else if (entity.mapped.model === 'GL-C-007-2ID') {
@@ -162,87 +164,76 @@ const generator = {
             return lightStatesWithColor;
         }
     },
-    freepad: (entity) => {
+    freepad: entity => {
         const freepad_st = [];
         const ecount = entity.device.endpoints.length;
         for (let i = 1; i <= ecount; i++) {
-            freepad_st.push(
-                {
-                    id: `btn${i}_single`,
-                    prop: 'action',
-                    name: `Button ${i} click event`,
-                    icon: undefined,
-                    role: 'button',
-                    write: false,
-                    read: true,
-                    type: 'boolean',
-                    isEvent: true,
-                    getter: payload => (payload.action === `button_${i}_single`) ? true : undefined,
-                }
-            );
-            freepad_st.push(
-                {
-                    id: `btn${i}_double`,
-                    prop: 'action',
-                    name: `Button ${i} double click event`,
-                    icon: undefined,
-                    role: 'button',
-                    write: false,
-                    read: true,
-                    type: 'boolean',
-                    isEvent: true,
-                    getter: payload => (payload.action === `button_${i}_double`) ? true : undefined,
-                }
-            );
-            freepad_st.push(
-                {
-                    id: `btn${i}_hold`,
-                    prop: 'action',
-                    name: `Button ${i} hold`,
-                    icon: undefined,
-                    role: 'button',
-                    write: false,
-                    read: true,
-                    type: 'boolean',
-                    getter: payload => (payload.action === `button_${i}_hold`) ? true : (payload.action === `button_${i}_release`) ? false : undefined,
-                }
-            );
-            freepad_st.push(
-                {
-                    id: `btn${i}_triple`,
-                    prop: 'action',
-                    name: `Button ${i} triple click event`,
-                    icon: undefined,
-                    role: 'button',
-                    write: false,
-                    read: true,
-                    type: 'boolean',
-                    isEvent: true,
-                    getter: payload => (payload.action === `button_${i}_triple`) ? true : undefined,
-                    lazy: true,
-                }
-            );
-            freepad_st.push(
-                {
-                    id: `btn${i}_quadruple`,
-                    prop: 'action',
-                    name: `Button ${i} quadruple click event`,
-                    icon: undefined,
-                    role: 'button',
-                    write: false,
-                    read: true,
-                    type: 'boolean',
-                    isEvent: true,
-                    getter: payload => (payload.action === `button_${i}_quadruple`) ? true : undefined,
-                    lazy: true,
-                }
-            );
-
+            freepad_st.push({
+                id: `btn${i}_single`,
+                prop: 'action',
+                name: `Button ${i} click event`,
+                icon: undefined,
+                role: 'button',
+                write: false,
+                read: true,
+                type: 'boolean',
+                isEvent: true,
+                getter: payload => (payload.action === `button_${i}_single`) ? true : undefined,
+            });
+            freepad_st.push({
+                id: `btn${i}_double`,
+                prop: 'action',
+                name: `Button ${i} double click event`,
+                icon: undefined,
+                role: 'button',
+                write: false,
+                read: true,
+                type: 'boolean',
+                isEvent: true,
+                getter: payload => (payload.action === `button_${i}_double`) ? true : undefined,
+            });
+            freepad_st.push({
+                id: `btn${i}_hold`,
+                prop: 'action',
+                name: `Button ${i} hold`,
+                icon: undefined,
+                role: 'button',
+                write: false,
+                read: true,
+                type: 'boolean',
+                getter: payload => (payload.action === `button_${i}_hold`) ? true : (payload.action === `button_${i}_release`) ? false : undefined,
+            });
+            freepad_st.push({
+                id: `btn${i}_triple`,
+                prop: 'action',
+                name: `Button ${i} triple click event`,
+                icon: undefined,
+                role: 'button',
+                write: false,
+                read: true,
+                type: 'boolean',
+                isEvent: true,
+                getter: payload => (payload.action === `button_${i}_triple`) ? true : undefined,
+                lazy: true,
+            });
+            freepad_st.push({
+                id: `btn${i}_quadruple`,
+                prop: 'action',
+                name: `Button ${i} quadruple click event`,
+                icon: undefined,
+                role: 'button',
+                write: false,
+                read: true,
+                type: 'boolean',
+                isEvent: true,
+                getter: payload => (payload.action === `button_${i}_quadruple`) ? true : undefined,
+                lazy: true,
+            });
         }
         return freepad_states.concat(freepad_st);
     },
-    ptvo_switch_channels: (entity) =>{
-        const devstates = [states.ptvo_trigger,states.ptvo_interval];
+    ptvo_switch_channels: entity => {
+        const devstates = [states.ptvo_trigger, states.ptvo_interval];
         for (const endpoint of entity.device.endpoints) {
             const epID = endpoint.ID;
             const epName = getKey(entity.mapped.endpoint(entity.device), epID);
@@ -268,8 +259,10 @@ const generator = {
                     //          l7:l7=143voltage_l7=143
 
                     if (payload.hasOwnProperty(`device_${epName}`)) {
-                        id = (typeof(payload[`device_${epName}`]) == 'string' ? payload[`device_${epName}`].replace(/[-. ]/g, ''):'unset');
-                    } else if (payload.hasOwnProperty(`voltage_${epName}`)) id = 'voltage';
+                        id = (typeof payload[`device_${epName}`] === 'string' ? payload[`device_${epName}`].replace(/[-. ]/g, '') : 'unset');
+                    } else if (payload.hasOwnProperty(`voltage_${epName}`)) {
+                        id = 'voltage';
+                    }
                     let unit = undefined;
                     let measurement = undefined;
                     for (const item in payload) {
@@ -283,12 +276,13 @@ const generator = {
                             }
                         }
                     }
-                    if (measurement && id != 'voltage')
-                        rv.stateid = id + '_'+measurement;
-                    else
+                    if (measurement && id !== 'voltage') {
+                        rv.stateid = `${id}_${measurement}`;
+                    } else {
                         rv.stateid = id;
+                    }
                     rv.value = payload[epName];
-                    rv.name = (measurement? measurement + ' 0x'+ id: '0x'+id);
+                    rv.name = measurement ? `${measurement} 0x${id}` : `0x${id}`;
                     rv.unit = unit;
                     rv.role = measurement;
 
@@ -306,8 +300,8 @@ const generator = {
                     write: true,
                     read: true,
                     type: 'boolean',
-                    getter: payload => (payload[`state_${epName}`] === 'ON'),
-                    setter: (value) => (value) ? 'ON' : 'OFF',
+                    getter: payload => payload[`state_${epName}`] === 'ON',
+                    setter: value => value ? 'ON' : 'OFF',
                     epname: epName,
                     setattr: 'state',
                 });
@@ -323,7 +317,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => (payload.action === `single_${epName}`) ? true : undefined,
+                    getter: payload => payload.action === `single_${epName}` ? true : undefined,
                 });
                 devstates.push({
                     id: `channel_${epID}.double`,
@@ -335,7 +329,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => (payload.action === `double_${epName}`) ? true : undefined,
+                    getter: payload => payload.action === `double_${epName}` ? true : undefined,
                 });
                 devstates.push({
                     id: `channel_${epID}.tripple`,
@@ -347,7 +341,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => (payload.action === `tripple_${epName}`) ? true : undefined,
+                    getter: payload => payload.action === `tripple_${epName}` ? true : undefined,
                 });
             }
             if (endpoint.supportsOutputCluster('genLevelCtrl')) {
@@ -362,12 +356,8 @@ const generator = {
                     unit: '',
                     min: 0,
                     max: 100,
-                    getter: payload => {
-                        return utils.bulbLevelToAdapterLevel(payload[`brightness_${epName}`]);
-                    },
-                    setter: (value) => {
-                        return utils.adapterLevelToBulbLevel(value);
-                    },
+                    getter: payload => utils.bulbLevelToAdapterLevel(payload[`brightness_${epName}`]),
+                    setter: value => utils.adapterLevelToBulbLevel(value),
                     epname: epName,
                     setattr: 'brightness',
                 });
@@ -386,9 +376,7 @@ const generator = {
                     getter: payload => { //l3=0  brightness_l3=0
                         return payload[`${epName}`];  //return payload[`brightness_${epName}`];
                     },
-                    setter: (value) => {
-                        return value;
-                    },
+                    setter: value => value,
                     epname: epName
                 });
             }
@@ -438,9 +426,15 @@ const generator = {
                 read: true,
                 type: 'boolean',
                 getter: payload => {
-                    if ((payload.action_group % ecount) != (epidx % ecount)) return undefined;
-                    if (payload.action == 'brightness_move_up') return true;
-                    if (payload.action == 'brightness_stop') return false;
+                    if ((payload.action_group % ecount) != (epidx % ecount)) {
+                        return undefined;
+                    }
+                    if (payload.action === 'brightness_move_up') {
+                        return true;
+                    }
+                    if (payload.action === 'brightness_stop') {
+                        return false;
+                    }
                     return undefined;
                 },
             });
@@ -454,9 +448,15 @@ const generator = {
                 read: true,
                 type: 'boolean',
                 getter: payload => {
-                    if ((payload.action_group % ecount) != (epidx % ecount)) return undefined;
-                    if (payload.action == 'brightness_move_down') return true;
-                    if (payload.action == 'brightness_stop') return false;
+                    if ((payload.action_group % ecount) != (epidx % ecount)) {
+                        return undefined;
+                    }
+                    if (payload.action === 'brightness_move_down') {
+                        return true;
+                    }
+                    if (payload.action === 'brightness_stop') {
+                        return false;
+                    }
                     return undefined;
                 },
             });
@@ -502,8 +502,8 @@ const generator = {
                     write: true,
                     read: true,
                     type: 'boolean',
-                    getter: payload => (payload[`state_${epName}`] === 'ON'),
-                    setter: (value) => (value) ? 'ON' : 'OFF',
+                    getter: payload => payload[`state_${epName}`] === 'ON',
+                    setter: value => value ? 'ON' : 'OFF',
                     epname: epName,
                     setattr: 'state',
                 });
@@ -519,7 +519,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => (payload.action === `single_${epName}`) ? true : undefined,
+                    getter: payload => payload.action === `single_${epName}` ? true : undefined,
                 });
                 devstates.push({
                     id: `btn_${epID}_double`,
@@ -531,7 +531,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => (payload.action === `double_${epName}`) ? true : undefined,
+                    getter: payload => payload.action === `double_${epName}` ? true : undefined,
                 });
                 devstates.push({
                     id: `btn_${epID}_tripple`,
@@ -543,7 +543,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => (payload.action === `tripple_${epName}`) ? true : undefined,
+                    getter: payload => payload.action === `tripple_${epName}` ? true : undefined,
                 });
             }
             if (endpoint.supportsOutputCluster('genLevelCtrl')) {
@@ -558,12 +558,8 @@ const generator = {
                     unit: '',
                     min: 0,
                     max: 100,
-                    getter: payload => {
-                        return utils.bulbLevelToAdapterLevel(payload[`brightness_${epName}`]);
-                    },
-                    setter: (value) => {
-                        return utils.adapterLevelToBulbLevel(value);
-                    },
+                    getter: payload => utils.bulbLevelToAdapterLevel(payload[`brightness_${epName}`]),
+                    setter: value => utils.adapterLevelToBulbLevel(value),
                     epname: epName,
                     setattr: 'brightness',
                 });
@@ -573,13 +569,13 @@ const generator = {
     },
 };
 
-function states_with_epname (entity, states) {
+function states_with_epname(entity, states) {
     const devstates = [];
     for (const endpoint of entity.device.endpoints) {
         const epID = endpoint.ID;
         const epName = getKey(entity.mapped.endpoint(entity.device), epID);
         for (const state of states) {
-            const newState = { ...state };
+            const newState = {...state};
             newState.id = `${newState.id}_${epName}`;
             if (newState.name) newState.name = `${newState.name} (${epName})`;
             if (newState.prop) newState.prop = `${newState.prop}_${epName}`;
@@ -626,7 +622,7 @@ const devices = [
         ],
     },
     {
-        models: ['WXKG03LM','WXKG03LM_rev2'],
+        models: ['WXKG03LM', 'WXKG03LM_rev2'],
         icon: 'img/86sw1.png',
         states: [
             states.click, states.double_click, states.voltage, states.battery,
@@ -642,7 +638,7 @@ const devices = [
         ],
     },
     {
-        models: ['WXKG02LM','WXKG02LM_rev2'],
+        models: ['WXKG02LM', 'WXKG02LM_rev2'],
         icon: 'img/86sw2.png',
         states: [
             states.left_click, states.right_click, states.both_click,
@@ -824,7 +820,7 @@ const devices = [
         models: ['ZNCLDJ11LM'],
         icon: 'img/aqara_curtain.png',
         states: [states.curtain_position, states.curtain_running, states.curtain_stop, states.curtain_xiaomi_reverse_direction,
-        states.curtain_xiaomi_reset_limits, states.curtain_xiaomi_hand_open],
+            states.curtain_xiaomi_reset_limits, states.curtain_xiaomi_hand_open],
     },
     {
         models: ['WXCJKG11LM'],
@@ -999,7 +995,7 @@ const devices = [
         states: [states.occupancy, states.temperature, states.temp_calibration],
     },
     {
-        models: ['595UGR22','4058075181472'],
+        models: ['595UGR22', '4058075181472'],
         icon: 'img/FLOALT.panel.WS.png',
         states: lightStatesWithColortemp,
         syncStates: [sync.brightness],
@@ -1172,7 +1168,7 @@ const devices = [
         syncStates: [sync.brightness],
     },
     {
-        models: ['5055131P7','5055148P7'],
+        models: ['5055131P7', '5055148P7'],
         icon: 'img/philips_hue_centura_square.png',
         states: lightStatesWithColor_hue,
         syncStates: [sync.brightness],
@@ -1494,7 +1490,7 @@ const devices = [
     {
         models: ['E1757', 'E1926'],
         states: [states.battery, states.blind_position, states.blind_open, states.blind_close, states.blind_stop],
-        icon:  'img/Ikea_fyrtur.png',
+        icon: 'img/Ikea_fyrtur.png',
     },
     {
         models: ['ICPSHC24-10EU-IL-1', 'ICPSHC24-30EU-IL-1'],
@@ -1516,7 +1512,7 @@ const devices = [
     {
         models: ['E1744'],
         icon: 'img/ikea_SYMFONISK_Sound_Controller.png',
-        states: [states.button_action_skip_back, states.button_action_skip_forward,  states.action_play_pause,
+        states: [states.button_action_skip_back, states.button_action_skip_forward, states.action_play_pause,
             states.rotate_left, states.rotate_right, states.rotate_stop, states.battery],
     },
     // Hive
@@ -1615,7 +1611,7 @@ const devices = [
     {
         models: ['SP 120', 'SP 220', 'SP 222', 'SP 224'],
         icon: 'img/innr_plug.png',
-        states: [states.state,states.load_power],
+        states: [states.state, states.load_power],
     },
     {
         models: ['FL 130 C'],
@@ -1922,7 +1918,7 @@ const devices = [
         syncStates: [sync.brightness],
     },
     {
-        models: ['798.09','371000002'],
+        models: ['798.09', '371000002'],
         icon: 'img/Paulmann_79809.png',
         states: lightStatesWithColor,
         syncStates: [sync.brightness],
@@ -1942,7 +1938,7 @@ const devices = [
             states.brightness_move_down, states.brightness_move_down_size,
             states.enhanced_move_to_hue_and_saturation, states.enhanced_move_enhanced_hue,
             states.enhanced_move_hue, states.enhanced_move_saturation,
-            states.scene,states.action_group
+            states.scene, states.action_group,
         ],
     },
 
@@ -2095,7 +2091,7 @@ const devices = [
         linkedStates: [comb.brightnessAndState],
     },
     {
-        models: ['MLI-404011','MLI-404049','MLI-404011/MLI-404049'],
+        models: ['MLI-404011', 'MLI-404049', 'MLI-404011/MLI-404049'],
         icon: 'img/MLI-404011-MLI-404049.png',
         states: [
             states.tint404011_scene_sunset, states.tint404011_scene_party,
@@ -2232,7 +2228,7 @@ const devices = [
     {
         models: ['07048L'],
         icon: 'img/innr_plug.png',
-        states: [states.state,states.load_power],
+        states: [states.state, states.load_power],
     },
     {
         models: ['AV2010/32'],
@@ -2408,12 +2404,12 @@ const devices = [
         states: [states.state],
     },
     {
-        models: [ 'X712A'],
+        models: ['X712A'],
         icon: 'img/tuya_switch_2.png',
         states: [states.l1, states.l2],
     },
     {
-        models: [ 'X713A'],
+        models: ['X713A'],
         icon: 'img/tuya_switch_3.png',
         states: [states.l1, states.l2, states.l3],
     },
@@ -2557,7 +2553,7 @@ const devices = [
         ],
     },
     {
-        models: ['SEA802-Zigbee','SEA801-Zigbee/SEA802-Zigbee'],
+        models: ['SEA802-Zigbee', 'SEA801-Zigbee/SEA802-Zigbee'],
         icon: 'img/tuya_TS0601.png',
         states: [
             states.child_lock,
@@ -3044,7 +3040,7 @@ const devices = [
         states: generator.icasa_remote,
     },
 
- /*    images only for admin                */
+    /* ------------ images only for admin ------------------- */
     {
         models: ['E1812'],
         icon: 'img/ikea_E1812.png',
@@ -3075,13 +3071,12 @@ const devices = [
     },
     {
         models: ['TI0001-cover'],
-		icon: 'img/TI0001-cover.png',
+        icon: 'img/TI0001-cover.png',
     },
     {
         models: ['E1603/E1702/E1708'],
         icon: 'img/ikea_control_outlet.png',
     },
-
 ];
 
 const commonStates = [
@@ -3094,11 +3089,10 @@ const commonStates = [
 
 const groupStates = [states.brightness_step].concat(lightStatesWithColor);
 
-
 function getByModel() {
     const byModel = new Map();
     for (const device of devices) {
-        for (const model of device.models) {
+        for (const model of device.models) {        
             const stripModel = model.replace(/\0.*$/g, '').trim();
             byModel.set(stripModel, device);
         }
@@ -3114,32 +3108,28 @@ function fillStatesWithExposes(allExcludesObj) {
     applyExposes(devices, byModel, allExcludesObj);
 
     removeEmptyStates(devices);
-
 }
 
 // remove empty states
 function removeEmptyStates(devices) {
     for (const device of devices) {
         if (Array.isArray(device.states)) {
-            device.states = device.states.filter((el) => el !== undefined);
+            device.states = device.states.filter(el => el !== undefined);
         }
     }
 }
 
-
 function findModel(model) {
     const byModel = getByModel();
     const stripModel = (model) ? model.replace(/\0.*$/g, '').trim() : '';
     return byModel.get(stripModel);
 }
 
-
-
 module.exports = {
-    devices: devices,
-    commonStates: commonStates,
-    groupStates: groupStates,
+    devices,
+    commonStates,
+    groupStates,
     groupsState: states.groups,
-    fillStatesWithExposes: fillStatesWithExposes,
-    findModel: findModel
+    fillStatesWithExposes,
+    findModel,
 };