zigbee-herdsman-converters 15.0.38 → 15.0.40

package/devices/acova.js

@@ -36,7 +36,8 @@ module.exports = [
         },
     },
     {
-        zigbeeModel: ['ALCANTARA2 D1.00P1.02Z1.00\u0000\u0000\u0000\u0000\u0000\u0000'],
+        zigbeeModel: ['ALCANTARA2 D1.00P1.01Z1.00\u0000\u0000\u0000\u0000\u0000\u0000',
+            'ALCANTARA2 D1.00P1.02Z1.00\u0000\u0000\u0000\u0000\u0000\u0000'],
         model: 'ALCANTARA2',
         vendor: 'Acova',
         description: 'Alcantara 2 heater',

package/devices/bankamp.js

@@ -5,7 +5,7 @@ module.exports = [
         zigbeeModel: ['Bankamp Dimm-Leuchte'],
         model: '2189/1-xx',
         vendor: 'Bankamp',
-        description: 'Grazia ceiling light',
+        description: 'Ceiling light (e.g. Grazia, Grand)',
         extend: extend.light_onoff_brightness(),
     },
 ];

package/devices/datek.js

@@ -10,12 +10,13 @@ const ea = exposes.access;
 
 module.exports = [
     {
-        fingerprint: [{modelID: 'PoP', manufacturerName: 'Eva'}],
+        zigbeeModel: ['PoP'],
         model: 'HLU2909K',
         vendor: 'Datek',
         description: 'APEX smart plug 16A',
         fromZigbee: [fz.on_off, fz.electrical_measurement, fz.temperature],
         toZigbee: [tz.on_off, tz.power_on_behavior],
+        ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'msTemperatureMeasurement']);
@@ -28,11 +29,10 @@ module.exports = [
             await reporting.activePower(endpoint);
             await reporting.temperature(endpoint);
         },
-        ota: ota.zigbeeOTA,
         exposes: [e.power(), e.current(), e.voltage(), e.switch(), e.temperature(), e.power_on_behavior()],
     },
     {
-        fingerprint: [{modelID: 'Meter Reader', manufacturerName: 'Eva'}],
+        zigbeeModel: ['Meter Reader'],
         model: 'HSE2905E',
         vendor: 'Datek',
         description: 'Datek Eva AMS HAN power-meter sensor',
@@ -86,7 +86,7 @@ module.exports = [
             e.voltage_phase_c(), e.temperature()],
     },
     {
-        fingerprint: [{modelID: 'Motion Sensor', manufacturerName: 'Eva'}],
+        zigbeeModel: ['Motion Sensor'],
         model: 'HSE2927E',
         vendor: 'Datek',
         description: 'Eva motion sensor',
@@ -114,7 +114,7 @@ module.exports = [
             exposes.numeric('occupancy_timeout', ea.ALL).withUnit('seconds').withValueMin(0).withValueMax(65535)],
     },
     {
-        fingerprint: [{modelID: 'ID Lock 150', manufacturerName: 'Eva'}],
+        zigbeeModel: ['ID Lock 150'],
         model: '0402946',
         vendor: 'Datek',
         description: 'Zigbee module for ID lock 150',
@@ -188,7 +188,7 @@ module.exports = [
                 'random_pin_24_hours']).withDescription('Service Mode of the Lock')],
     },
     {
-        fingerprint: [{modelID: 'Water Sensor', manufacturerName: 'Eva'}],
+        zigbeeModel: ['Water Sensor'],
         model: 'HSE2919E',
         vendor: 'Datek',
         description: 'Eva water leak sensor',
@@ -229,7 +229,6 @@ module.exports = [
                 'brightness_move_down', 'brightness_move_up', 'brightness_stop'])],
     },
     {
-        fingerprint: [{modelID: 'Door/Window Sensor', manufacturerName: 'Eva'}],
         zigbeeModel: ['Door/Window Sensor'],
         model: 'HSE2920E',
         vendor: 'Datek',

package/devices/essentialb.js

@@ -8,4 +8,11 @@ module.exports = [
         description: 'Smart LED bulb',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
     },
+    {
+        zigbeeModel: ['EB-E27-ST64-CCT-FV'],
+        model: 'EB-E27-ST64-CCT-FV',
+        vendor: 'EssentielB',
+        description: 'Filament vintage light bulb',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 454]}),
+    },
 ];

package/devices/lonsonho.js

@@ -183,7 +183,7 @@ module.exports = [
             {disableColorTempStartup: true, colorTempRange: [153, 500], disableEffect: true}),
     },
     {
-        fingerprint: [{modelID: 'TS0003', manufacturerName: '_TYZB01_zsl6z0pw'}],
+        fingerprint: [{modelID: 'TS0003', manufacturerName: '_TYZB01_zsl6z0pw'}, {modelID: 'TS0003', manufacturerName: '_TYZB01_uqkphoed'}],
         model: 'QS-Zigbee-S04-2C-LN',
         vendor: 'Lonsonho',
         description: '2 gang switch module with neutral wire',

package/devices/namron.js

@@ -466,7 +466,7 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
 
             // standard ZCL attributes
-            await reporting.thermostatTemperature(endpoint);
+            await reporting.thermostatTemperature(endpoint, {min: 0, change: 50});
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
             await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
             await reporting.thermostatKeypadLockMode(endpoint);
@@ -478,14 +478,14 @@ module.exports = [
                 reportableChange: null,
             }]);
 
+            // Metering
             await endpoint.read('haElectricalMeasurement', ['acVoltageMultiplier', 'acVoltageDivisor', 'acCurrentMultiplier']);
             await endpoint.read('haElectricalMeasurement', ['acCurrentDivisor']);
-
-            await reporting.activePower(endpoint);
-            await reporting.rmsCurrent(endpoint, {min: 10, change: 10});
-            await reporting.rmsVoltage(endpoint, {min: 10});
+            await reporting.rmsVoltage(endpoint, {min: 10, change: 20}); // Voltage - Min change of 2v
+            await reporting.rmsCurrent(endpoint, {min: 10, change: 10}); // A - z2m displays only the first decimals, so change of 10 (0,01)
+            await reporting.activePower(endpoint, {min: 10, change: 15}); // W - Min change of 1,5W
+            await reporting.currentSummDelivered(endpoint, {min: 300}); // Report KWH every 5min
             await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.currentSummDelivered(endpoint);
 
             // Custom attributes
             const options = {manufacturerCode: 0x1224};

package/devices/philips.js

@@ -442,7 +442,7 @@ module.exports = [
         model: '7602031P7',
         vendor: 'Philips',
         description: 'Hue Go with Bluetooth',
-        extend: philips.extend.light_onoff_brightness_colortemp_color({disableHueEffects: true}),
+        extend: philips.extend.light_onoff_brightness_colortemp_color({disableHueEffects: false}),
     },
     {
         zigbeeModel: ['LCF002', 'LCF001'],
@@ -1496,7 +1496,7 @@ module.exports = [
         model: '1742930P7',
         vendor: 'Philips',
         description: 'Hue outdoor Impress wall lamp',
-        extend: philips.extend.light_onoff_brightness_colortemp_color(),
+        extend: philips.extend.light_onoff_brightness_colortemp_color({disableHueEffects: false}),
     },
     {
         zigbeeModel: ['1743030P7'],
@@ -1524,7 +1524,7 @@ module.exports = [
         model: '1746430P7',
         vendor: 'Philips',
         description: 'Hue outdoor Resonate wall lamp (black)',
-        extend: philips.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: philips.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], disableHueEffects: false}),
     },
     {
         zigbeeModel: ['1746447P7'],
@@ -2231,6 +2231,13 @@ module.exports = [
         description: 'Hue white filament Edison ST72 E27 LED warm-to-cool',
         extend: philips.extend.light_onoff_brightness_colortemp({colorTempRange: [222, 454]}),
     },
+    {
+        zigbeeModel: ['LTV003'],
+        model: '8719514301528',
+        vendor: 'Philips',
+        description: 'Hue Filament White Ambiance ST72 B22 LED warm-to-cool',
+        extend: philips.extend.light_onoff_brightness_colortemp({colorTempRange: [222, 454]}),
+    },
     {
         zigbeeModel: ['LTV004'],
         model: '929002478401',

package/devices/robb.js

@@ -142,7 +142,7 @@ module.exports = [
             'on_3', 'off_3', 'brightness_move_up_3', 'brightness_move_down_3', 'brightness_stop_3',
             'on_4', 'off_4', 'brightness_move_up_4', 'brightness_move_down_4', 'brightness_stop_4'])],
         toZigbee: [],
-        meta: {multiEndpoint: true, battery: {dontDividePercentage: true}},
+        meta: {multiEndpoint: true},
         whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZG9001K8-DIM'}],
     },
     {

package/devices/schneider_electric.js

@@ -686,7 +686,7 @@ module.exports = [
         zigbeeModel: ['2GANG/SWITCH/2'],
         model: 'MEG5126-0300',
         vendor: 'Schneider Electric',
-        description: 'Merten MEG5165 PlusLink shutter insert with Merten Wiser System M push button (2fold)',
+        description: 'Merten MEG5165 PlusLink relais insert with Merten Wiser System M push button (2fold)',
         extend: extend.switch(),
         exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2')],
         meta: {multiEndpoint: true},

package/devices/sinope.js

@@ -398,7 +398,7 @@ const tzLocal = {
         },
     },
     led_intensity_on: {
-        // DM2500ZB and SW2500ZB
+        // DM25x0ZB and SW2500ZB
         key: ['led_intensity_on'],
         convertSet: async (entity, key, value, meta) => {
             if (value >= 0 && value <= 100) {
@@ -424,7 +424,7 @@ const tzLocal = {
         },
     },
     led_color_on: {
-        // DM2500ZB and SW2500ZB
+        // DM25x0ZB and SW2500ZB
         key: ['led_color_on'],
         convertSet: async (entity, key, value, meta) => {
             const r = (value.r >= 0 && value.r <= 255) ? value.r : 0;
@@ -436,7 +436,7 @@ const tzLocal = {
         },
     },
     led_color_off: {
-        // DM2500ZB and SW2500ZB
+        // DM25x0ZB and SW2500ZB
         key: ['led_color_off'],
         convertSet: async (entity, key, value, meta) => {
             const r = (value.r >= 0 && value.r <= 255) ? value.r : 0;
@@ -448,7 +448,7 @@ const tzLocal = {
         },
     },
     minimum_brightness: {
-        // DM2500ZB
+        // DM2x0ZB
         key: ['minimum_brightness'],
         convertSet: async (entity, key, value, meta) => {
             if (value >= 0 && value <= 3000) {
@@ -461,7 +461,7 @@ const tzLocal = {
         },
     },
     timer_seconds: {
-        // DM2500ZB and SW2500ZB
+        // DM25x0ZB and SW2500ZB
         key: ['timer_seconds'],
         convertSet: async (entity, key, value, meta) => {
             if (value >= 0 && value <= 10800) {
@@ -1028,6 +1028,42 @@ module.exports = [
             await reporting.brightness(endpoint);
         },
     },
+    {
+        zigbeeModel: ['DM2550ZB'],
+        model: 'DM2550ZB',
+        vendor: 'Sinopé',
+        description: 'Zigbee Adaptive phase smart dimmer',
+        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('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.ALL).withValueMin(0).withValueMax(100)
+                .withDescription('Control status LED when load OFF'),
+            exposes.numeric('minimum_brightness', ea.ALL).withValueMin(0).withValueMax(3000)
+                .withDescription('Control minimum dimmer brightness'),
+            exposes.composite('led_color_on', 'led_color_on', ea.SET)
+                .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', ea.SET)
+                .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);
+            const endpoint = device.getEndpoint(1);
+            const binds = ['genBasic', 'genLevelCtrl'];
+            await reporting.bind(endpoint, coordinatorEndpoint, binds);
+            await reporting.onOff(endpoint);
+            await reporting.brightness(endpoint);
+        },
+    },
     {
         zigbeeModel: ['SP2600ZB'],
         model: 'SP2600ZB',

package/devices/stelpro.js

@@ -48,6 +48,9 @@ module.exports = [
             await reporting.thermostatSystemMode(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
             await reporting.thermostatKeypadLockMode(endpoint);
+            // Has Unknown power source, force it.
+            device.powerSource = 'Mains (single phase)';
+            device.save();
         },
     },
     {

package/devices/xiaomi.js

@@ -2832,6 +2832,7 @@ module.exports = [
             await device.getEndpoint(1).write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
             await endpoint.read('aqaraOpple', [0x0000], {manufactureCode: 0x115f});
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.plug.sacn03'],
@@ -3057,6 +3058,7 @@ module.exports = [
         zigbeeModel: ['lumi.remote.cagl02'],
         model: 'CTP-R01',
         vendor: 'Xiaomi',
+        whiteLabel: [{vendor: 'Xiaomi', model: 'MFCZQ12LM'}],
         description: 'Aqara magic cube T1 Pro',
         meta: {battery: {voltageToPercentage: '3V_2850_3000'}},
         ota: ota.zigbeeOTA,

package/package.json

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