npm - zigbee-herdsman-converters - Versions diffs - 15.0.13 → 15.0.14 - Mend

zigbee-herdsman-converters 15.0.13 → 15.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/converters/fromZigbee.js CHANGED Viewed

@@ -5444,7 +5444,7 @@ const converters = {
                     61: 'all',
                 };
             }
-            if (['WS-USC02'].includes(model.model)) {
+            if (['WS-USC02', 'WS-USC04'].includes(model.model)) {
                 buttonLookup = {41: 'top', 42: 'bottom', 51: 'both'};
             }

package/converters/toZigbee.js CHANGED Viewed

@@ -2139,6 +2139,7 @@ const converters = {
             if (['SP-EUC01', 'ZNCZ04LM', 'ZNCZ12LM', 'ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM', 'SSM-U01', 'SSM-U02', 'DLKZMK11LM', 'DLKZMK12LM',
                 'WS-EUK01', 'WS-EUK02', 'WS-EUK03', 'WS-EUK04', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM',
                 'QBKG31LM', 'QBKG34LM', 'QBKG38LM', 'QBKG39LM', 'QBKG40LM', 'QBKG41LM', 'ZNDDMK11LM', 'ZNLDP13LM',
+                'WS-USC02', 'WS-USC04',
             ].includes(meta.mapped.model)) {
                 await entity.write('aqaraOpple', {0x0201: {value: value ? 1 : 0, type: 0x10}}, manufacturerOptions.xiaomi);
             } else if (['ZNCZ02LM', 'QBCZ11LM', 'LLKZMK11LM'].includes(meta.mapped.model)) {
@@ -2163,6 +2164,7 @@ const converters = {
             if (['SP-EUC01', 'ZNCZ04LM', 'ZNCZ12LM', 'ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM', 'SSM-U01', 'SSM-U02', 'DLKZMK11LM', 'DLKZMK12LM',
                 'WS-EUK01', 'WS-EUK02', 'WS-EUK03', 'WS-EUK04', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM',
                 'QBKG31LM', 'QBKG34LM', 'QBKG38LM', 'QBKG39LM', 'QBKG40LM', 'QBKG41LM', 'ZNDDMK11LM', 'ZNLDP13LM',
+                'WS-USC02', 'WS-USC04',
             ].includes(meta.mapped.model)) {
                 await entity.read('aqaraOpple', [0x0201]);
             } else if (['ZNCZ02LM', 'QBCZ11LM', 'ZNCZ11LM'].includes(meta.mapped.model)) {

package/devices/centralite.js CHANGED Viewed

@@ -340,4 +340,20 @@ module.exports = [
             await reporting.activePower(endpoint, {change: 2});
         },
     },
+    {
+        zigbeeModel: ['3315-Geu'],
+        model: '3315-Geu',
+        vendor: 'Centralite',
+        description: 'Water sensor',
+        fromZigbee: [fz.temperature, fz.ias_water_leak_alarm_1, fz.battery],
+        exposes: [e.temperature(), e.water_leak(), e.battery_low(), e.tamper(), e.battery()],
+        toZigbee: [],
+        meta: {battery: {voltageToPercentage: '3V_2500'}},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement', 'genPowerCfg']);
+            await reporting.temperature(endpoint);
+            await reporting.batteryVoltage(endpoint);
+        },
+    },
 ];

package/devices/heiman.js CHANGED Viewed

@@ -476,7 +476,7 @@ module.exports = [
         },
     },
     {
-        zigbeeModel: ['GASSensor-EM'],
+        zigbeeModel: ['GASSensor-EM', '358e4e3e03c644709905034dae81433e'],
         model: 'HS1CG-E',
         vendor: 'HEIMAN',
         description: 'Combustible gas sensor',

package/devices/iris.js CHANGED Viewed

@@ -177,20 +177,4 @@ module.exports = [
             await reporting.batteryVoltage(endpoint);
         },
     },
-    {
-        zigbeeModel: ['3315-Geu'],
-        model: '3315-Geu',
-        vendor: 'Iris',
-        description: 'Water sensor',
-        fromZigbee: [fz.temperature, fz.ias_water_leak_alarm_1, fz.battery],
-        exposes: [e.temperature(), e.water_leak(), e.battery_low(), e.tamper(), e.battery()],
-        toZigbee: [],
-        meta: {battery: {voltageToPercentage: '3V_2500'}},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement', 'genPowerCfg']);
-            await reporting.temperature(endpoint);
-            await reporting.batteryVoltage(endpoint);
-        },
-    },
 ];

package/devices/legrand.js CHANGED Viewed

@@ -130,7 +130,9 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBinaryInput', 'closuresWindowCovering', 'genIdentify']);
             await reporting.currentPositionLiftPercentage(endpoint);
         },
-        exposes: [e.cover_position()],
+        exposes: [e.cover_position(),
+            exposes.binary('led_in_dark', ea.ALL, 'ON', 'OFF').withDescription(`Enables the LED when the power socket is turned off,
+            allowing to see it in the dark`)],
     },
     {
         // swbuildid 001a requires coverInverted: https://github.com/Koenkk/zigbee2mqtt/issues/15101#issuecomment-1356787490

package/devices/philips.js CHANGED Viewed

@@ -458,7 +458,7 @@ module.exports = [
         model: '929002994901',
         vendor: 'Philips',
         description: 'Hue gradient lightstrip',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['929003045401'],
@@ -789,6 +789,13 @@ module.exports = [
         description: 'Hue white E12',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['LTE004'],
+        model: '9290031451',
+        vendor: 'Philips',
+        description: 'Hue white ambiance filament E12 with Bluetooth',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
     {
         zigbeeModel: ['LWA007'],
         model: '929002277501',
@@ -1960,14 +1967,14 @@ module.exports = [
         model: '915005986901',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Gradient Signe table lamp (white)',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['915005987001'],
         model: '915005987001',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Gradient Signe table lamp (black)',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['5060730P7_01', '5060730P7_02', '5060730P7_03', '5060730P7_04', '5060730P7_05'],
@@ -2721,21 +2728,21 @@ module.exports = [
         model: '929002422702',
         vendor: 'Philips',
         description: 'Hue Play gradient lightstrip 55',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['LCX002'],
         model: '929002422801',
         vendor: 'Philips',
         description: 'Hue Play gradient lightstrip 65',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['LCX003'],
         model: '929002422901',
         vendor: 'Philips',
         description: 'Hue Play gradient lightstrip 75',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['929003099301'],
@@ -2935,7 +2942,7 @@ module.exports = [
         model: '929002966501',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance Surimu rectangle panel',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['5060930P7_01', '5060930P7_02', '5060930P7_03', '5060930P7_04'],

package/devices/sinope.js CHANGED Viewed

@@ -155,6 +155,18 @@ const fzLocal = {
             if (msg.data.hasOwnProperty('pumpProtection')) {
                 result.pump_protection = msg.data['pumpProtection'] == 1 ? 'ON' : 'OFF';
             }
+            if (msg.data.hasOwnProperty('dimmerTimmer')) {
+                result.timer_seconds = msg.data['dimmerTimmer'];
+            }
+            if (msg.data.hasOwnProperty('ledIntensityOn')) {
+                result.led_intensity_on = msg.data['ledIntensityOn'];
+            }
+            if (msg.data.hasOwnProperty('ledIntensityOff')) {
+                result.led_intensity_off = msg.data['ledIntensityOff'];
+            }
+            if (msg.data.hasOwnProperty('minimumBrightness')) {
+                result.minimum_brightness = msg.data['minimumBrightness'];
+            }
             return result;
         },
     },
@@ -380,6 +392,10 @@ const tzLocal = {
             if (value >= 0 && value <= 100) {
                 await entity.write('manuSpecificSinope', {ledIntensityOn: value});
             }
+            return {readAfterWriteTime: 250, state: {ledIntensityOn: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('manuSpecificSinope', ['ledIntensityOn']);
         },
     },
     led_intensity_off: {
@@ -389,6 +405,10 @@ const tzLocal = {
             if (value >= 0 && value <= 100) {
                 await entity.write('manuSpecificSinope', {ledIntensityOff: value});
             }
+            return {readAfterWriteTime: 250, state: {ledIntensityOff: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('manuSpecificSinope', ['ledIntensityOff']);
         },
     },
     led_color_on: {
@@ -422,6 +442,23 @@ const tzLocal = {
             if (value >= 0 && value <= 3000) {
                 await entity.write('manuSpecificSinope', {minimumBrightness: value});
             }
+            return {readAfterWriteTime: 250, state: {minimumBrightness: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('manuSpecificSinope', ['minimumBrightness']);
+        },
+    },
+    timer_seconds: {
+        // DM2500ZB and SW2500ZB
+        key: ['timer_seconds'],
+        convertSet: async (entity, key, value, meta) => {
+            if (value >= 0 && value <= 10800) {
+                await entity.write('manuSpecificSinope', {dimmerTimmer: value});
+            }
+            return {readAfterWriteTime: 250, state: {dimmerTimmer: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('manuSpecificSinope', ['dimmerTimmer']);
         },
     },
 };
@@ -819,22 +856,25 @@ module.exports = [
         model: 'SW2500ZB',
         vendor: 'Sinopé',
         description: 'Zigbee smart light switch',
-        fromZigbee: [fz.on_off, fz.electrical_measurement],
-        toZigbee: [tz.on_off, tzLocal.led_intensity_on, tzLocal.led_intensity_off, tzLocal.led_color_on, tzLocal.led_color_off],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fzLocal.sinope],
+        toZigbee: [tz.on_off, tzLocal.timer_seconds, tzLocal.led_intensity_on, tzLocal.led_intensity_off,
+            tzLocal.led_color_on, tzLocal.led_color_off],
         exposes: [e.switch(),
-            exposes.numeric('led_intensity_on', ea.SET).withValueMin(0).withValueMax(100)
+            exposes.numeric('timer_seconds', ea.ALL).withValueMin(0).withValueMax(10800)
+                .withDescription('Automatically turn off load after x seconds'),
+            exposes.numeric('led_intensity_on', ea.ALL).withValueMin(0).withValueMax(100)
                 .withDescription('Control status LED intensity when load ON'),
-            exposes.numeric('led_intensity_off', ea.SET).withValueMin(0).withValueMax(100)
+            exposes.numeric('led_intensity_off', ea.ALL).withValueMin(0).withValueMax(100)
                 .withDescription('Control status LED intensity when load OFF'),
             exposes.composite('led_color_on', 'led_color_on')
-                .withFeature(exposes.numeric('r', ea.ALL))
-                .withFeature(exposes.numeric('g', ea.ALL))
-                .withFeature(exposes.numeric('b', ea.ALL))
+                .withFeature(exposes.numeric('r', ea.SET))
+                .withFeature(exposes.numeric('g', ea.SET))
+                .withFeature(exposes.numeric('b', ea.SET))
                 .withDescription('Control status LED color when load ON'),
             exposes.composite('led_color_off', 'led_color_off')
-                .withFeature(exposes.numeric('r', ea.ALL))
-                .withFeature(exposes.numeric('g', ea.ALL))
-                .withFeature(exposes.numeric('b', ea.ALL))
+                .withFeature(exposes.numeric('r', ea.SET))
+                .withFeature(exposes.numeric('g', ea.SET))
+                .withFeature(exposes.numeric('b', ea.SET))
                 .withDescription('Control status LED color when load OFF')],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -848,25 +888,27 @@ module.exports = [
         model: 'DM2500ZB',
         vendor: 'Sinopé',
         description: 'Zigbee smart dimmer',
-        fromZigbee: [fz.on_off, fz.brightness, fz.electrical_measurement],
-        toZigbee: [tz.light_onoff_brightness, tzLocal.led_intensity_on, tzLocal.led_intensity_off, tzLocal.minimum_brightness,
-            tzLocal.led_color_on, tzLocal.led_color_off],
+        fromZigbee: [fz.on_off, fz.brightness, fz.electrical_measurement, fzLocal.sinope],
+        toZigbee: [tz.light_onoff_brightness, tzLocal.timer_seconds, tzLocal.led_intensity_on, tzLocal.led_intensity_off,
+            tzLocal.minimum_brightness, tzLocal.led_color_on, tzLocal.led_color_off],
         exposes: [e.light_brightness(),
-            exposes.numeric('led_intensity_on', ea.SET).withValueMin(0).withValueMax(100)
+            exposes.numeric('timer_seconds', ea.ALL).withValueMin(0).withValueMax(10800)
+                .withDescription('Automatically turn off load after x seconds'),
+            exposes.numeric('led_intensity_on', ea.ALL).withValueMin(0).withValueMax(100)
                 .withDescription('Control status LED when load ON'),
-            exposes.numeric('led_intensity_off', ea.SET).withValueMin(0).withValueMax(100)
+            exposes.numeric('led_intensity_off', ea.ALL).withValueMin(0).withValueMax(100)
                 .withDescription('Control status LED when load OFF'),
-            exposes.numeric('minimum_brightness', ea.SET).withValueMin(0).withValueMax(3000)
+            exposes.numeric('minimum_brightness', ea.ALL).withValueMin(0).withValueMax(3000)
                 .withDescription('Control minimum dimmer brightness'),
             exposes.composite('led_color_on', 'led_color_on')
-                .withFeature(exposes.numeric('r', ea.ALL))
-                .withFeature(exposes.numeric('g', ea.ALL))
-                .withFeature(exposes.numeric('b', ea.ALL))
+                .withFeature(exposes.numeric('r', ea.SET))
+                .withFeature(exposes.numeric('g', ea.SET))
+                .withFeature(exposes.numeric('b', ea.SET))
                 .withDescription('Control status LED color when load ON'),
             exposes.composite('led_color_off', 'led_color_off')
-                .withFeature(exposes.numeric('r', ea.ALL))
-                .withFeature(exposes.numeric('g', ea.ALL))
-                .withFeature(exposes.numeric('b', ea.ALL))
+                .withFeature(exposes.numeric('r', ea.SET))
+                .withFeature(exposes.numeric('g', ea.SET))
+                .withFeature(exposes.numeric('b', ea.SET))
                 .withDescription('Control status LED color when load OFF')],
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);

package/devices/xiaomi.js CHANGED Viewed

@@ -710,7 +710,9 @@ module.exports = [
         vendor: 'Xiaomi',
         description: 'Aqara smart wall switch (no neutral, double rocker)',
         fromZigbee: [fz.on_off, fz.xiaomi_multistate_action, fz.aqara_opple],
-        toZigbee: [tz.on_off, tz.xiaomi_switch_operation_mode_opple, tz.xiaomi_flip_indicator_light, tz.aqara_switch_mode_switch],
+        toZigbee: [
+            tz.on_off, tz.xiaomi_switch_operation_mode_opple, tz.xiaomi_flip_indicator_light,
+            tz.xiaomi_switch_power_outage_memory, tz.aqara_switch_mode_switch],
         exposes: [
             e.switch().withEndpoint('top'),
             e.switch().withEndpoint('bottom'),
@@ -728,6 +730,7 @@ module.exports = [
             e.power_outage_count(),
             e.device_temperature().withAccess(ea.STATE),
             e.flip_indicator_light(),
+            e.power_outage_memory(),
             e.action(['single_top', 'single_bottom', 'single_both', 'double_top', 'double_bottom', 'double_both'])],
         meta: {multiEndpoint: true},
         endpoint: (device) => {
@@ -759,19 +762,36 @@ module.exports = [
         model: 'WS-USC04',
         vendor: 'Xiaomi',
         description: 'Aqara smart wall switch (neutral, double rocker)',
-        extend: extend.switch(),
-        exposes: [e.switch().withEndpoint('top'), e.switch().withEndpoint('bottom')],
+        fromZigbee: [fz.on_off, fz.xiaomi_power, fz.xiaomi_multistate_action, fz.aqara_opple],
+        toZigbee: [
+            tz.on_off, tz.xiaomi_power, tz.xiaomi_switch_operation_mode_opple, tz.xiaomi_switch_power_outage_memory,
+            tz.xiaomi_flip_indicator_light],
+        exposes: [
+            e.switch().withEndpoint('top'),
+            e.switch().withEndpoint('bottom'),
+            exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled'])
+                .withDescription('Decoupled mode for top button')
+                .withEndpoint('top'),
+            exposes.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled'])
+                .withDescription('Decoupled mode for bottom button')
+                .withEndpoint('bottom'),
+            e.power_outage_count(),
+            e.device_temperature().withAccess(ea.STATE),
+            e.flip_indicator_light(),
+            e.power().withAccess(ea.STATE_GET),
+            e.energy(),
+            e.voltage(),
+            e.power_outage_memory(),
+            e.action(['single_top', 'single_bottom', 'single_both', 'double_top', 'double_bottom', 'double_both'])],
         meta: {multiEndpoint: true},
         endpoint: (device) => {
             return {'top': 1, 'bottom': 2};
         },
+        onEvent: preventReset,
         configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint1 = device.getEndpoint(1);
-            await reporting.bind(endpoint1, coordinatorEndpoint, ['genOnOff']);
-            await reporting.onOff(endpoint1);
-            const endpoint2 = device.getEndpoint(2);
-            await reporting.bind(endpoint2, coordinatorEndpoint, ['genOnOff']);
-            await reporting.onOff(endpoint2);
+            await device.getEndpoint(1).write(
+                'aqaraOpple', {mode: 1}, {manufacturerCode: 0x115f, disableResponse: true},
+            );
         },
         ota: ota.zigbeeOTA,
     },

package/lib/ota/common.js CHANGED Viewed

@@ -248,12 +248,12 @@ async function isUpdateAvailable(device, logger, isNewImageAvailable, requestPay
         requestPayload = request.payload;
     }
-    const available = await isNewImageAvailable(requestPayload, logger, device, getImageMeta);
-    logger.debug(`Update available for '${device.ieeeAddr}': ${available < 0 ? 'YES' : 'NO'}`);
-    if (available > 0) {
+    const availableResult = await isNewImageAvailable(requestPayload, logger, device, getImageMeta);
+    logger.debug(`Update available for '${device.ieeeAddr}': ${availableResult.available < 0 ? 'YES' : 'NO'}`);
+    if (availableResult.available > 0) {
         logger.warn(`Firmware on '${device.ieeeAddr}' is newer than latest firmware online.`);
     }
-    return {...available, available: available < 0};
+    return {...availableResult, available: availableResult.available < 0};
 }
 async function isNewImageAvailable(current, logger, device, getImageMeta) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.13",
+  "version": "15.0.14",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [