zigbee-herdsman-converters 14.0.636 → 14.0.638

package/converters/toZigbee.js

@@ -3327,6 +3327,12 @@ const converters = {
             await tuya.sendDataPointValue(entity, tuya.dataPoints.moesTempCalibration, value);
         },
     },
+    moes_thermostat_min_temperature_limit: {
+        key: ['min_temperature_limit'],
+        convertSet: async (entity, key, value, meta) => {
+            await tuya.sendDataPointValue(entity, tuya.dataPoints.moesMinTempLimit, value);
+        },
+    },
     moes_thermostat_max_temperature_limit: {
         key: ['max_temperature_limit'],
         convertSet: async (entity, key, value, meta) => {

package/devices/candeo.js

@@ -1,5 +1,8 @@
+const exposes = require('../lib/exposes');
+const fz = require('../converters/fromZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+const e = exposes.presets;
 
 module.exports = [
     {
@@ -21,4 +24,26 @@ module.exports = [
             await reporting.brightness(endpoint, {min: 1});
         },
     },
+    {
+        zigbeeModel: ['C204'],
+        model: 'C204',
+        vendor: 'Candeo',
+        description: 'Zigbee micro smart dimmer',
+        fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.electrical_measurement, fz.metering, fz.ignore_genOta]),
+        toZigbee: extend.light_onoff_brightness().toZigbee,
+        exposes: [e.light_brightness(), e.power(), e.voltage(), e.current(), e.energy()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            const binds = ['genOnOff', 'genLevelCtrl', 'haElectricalMeasurement', 'seMetering'];
+            await reporting.bind(endpoint, coordinatorEndpoint, binds);
+            await reporting.onOff(endpoint);
+            await reporting.brightness(endpoint);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.activePower(endpoint);
+            await reporting.rmsCurrent(endpoint, {min: 10, change: 10});
+            await reporting.rmsVoltage(endpoint, {min: 10});
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint);
+        },
+    },
 ];

package/devices/develco.js

@@ -516,20 +516,23 @@ module.exports = [
             return {default: 35};
         },
         configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint1 = device.getEndpoint(35);
-            await reporting.bind(endpoint1, coordinatorEndpoint, ['genPowerCfg']);
-            await reporting.batteryVoltage(endpoint1, {min: constants.repInterval.HOUR, max: 43200, change: 100});
-            await endpoint1.read('genPowerCfg', ['batteryVoltage']);
-            await endpoint1.read('genBasic', ['develcoLedControl'], manufacturerOptions);
-            await endpoint1.read('ssIasZone', ['develcoAlarmOffDelay'], manufacturerOptions);
+            const endpoint35 = device.getEndpoint(35);
+            await reporting.bind(endpoint35, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryVoltage(endpoint35, {min: constants.repInterval.HOUR, max: 43200, change: 100});
+            try {
+                await endpoint35.read('ssIasZone', ['develcoAlarmOffDelay'], manufacturerOptions);
+                await endpoint35.read('genBasic', ['develcoLedControl'], manufacturerOptions);
+            } catch (error) {/* some reports of timeouts on reading these */}
 
-            const endpoint2 = device.getEndpoint(38);
-            await reporting.bind(endpoint2, coordinatorEndpoint, ['msTemperatureMeasurement']);
-            await reporting.temperature(endpoint2);
+            const endpoint38 = device.getEndpoint(38);
+            await reporting.bind(endpoint38, coordinatorEndpoint, ['msTemperatureMeasurement']);
+            await reporting.temperature(endpoint38,
+                {min: constants.repInterval.MINUTE, max: constants.repInterval.MINUTES_10, change: 100});
 
-            const endpoint3 = device.getEndpoint(39);
-            await reporting.bind(endpoint3, coordinatorEndpoint, ['msIlluminanceMeasurement']);
-            await reporting.illuminance(endpoint3);
+            const endpoint39 = device.getEndpoint(39);
+            await reporting.bind(endpoint39, coordinatorEndpoint, ['msIlluminanceMeasurement']);
+            await reporting.illuminance(endpoint39,
+                {min: constants.repInterval.MINUTE, max: constants.repInterval.MINUTES_10, change: 500});
         },
     },
     {

package/devices/moes.js

@@ -181,8 +181,8 @@ module.exports = [
         fromZigbee: [fz.moes_thermostat],
         toZigbee: [tz.moes_thermostat_child_lock, tz.moes_thermostat_current_heating_setpoint, tz.moes_thermostat_mode,
             tz.moes_thermostat_standby, tz.moes_thermostat_sensor, tz.moes_thermostat_calibration,
-            tz.moes_thermostat_deadzone_temperature, tz.moes_thermostat_max_temperature_limit],
-        exposes: [e.child_lock(), e.deadzone_temperature(), e.max_temperature_limit(),
+            tz.moes_thermostat_deadzone_temperature, tz.moes_thermostat_max_temperature_limit, tz.moes_thermostat_min_temperature_limit],
+        exposes: [e.child_lock(), e.deadzone_temperature(), e.max_temperature_limit(), e.min_temperature_limit(),
             exposes.climate().withSetpoint('current_heating_setpoint', 5, 30, 1, ea.STATE_SET)
                 .withLocalTemperature(ea.STATE).withLocalTemperatureCalibration(-30, 30, 0.1, ea.STATE_SET)
                 .withSystemMode(['off', 'heat'], ea.STATE_SET).withRunningState(['idle', 'heat', 'cool'], ea.STATE)

package/devices/nyce.js

@@ -40,7 +40,6 @@ module.exports = [
         fromZigbee: [fz.occupancy, fz.humidity, fz.temperature, fz.ignore_basic_report, fz.ignore_genIdentify, fz.ignore_poll_ctrl,
             fz.battery, fz.ignore_iaszone_report, fz.ias_occupancy_alarm_2],
         toZigbee: [],
-        meta: {battery: {dontDividePercentage: true}},
         exposes: [e.occupancy(), e.humidity(), e.temperature(), e.battery(), e.battery_low(), e.tamper()],
     },
     {

package/devices/philips.js

@@ -687,7 +687,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color(),
     },
     {
-        zigbeeModel: ['4090531P9', '929003053601'],
+        zigbeeModel: ['4090531P9', '929003053601', '929003053501'],
         model: '4090531P9',
         vendor: 'Philips',
         description: 'Hue Flourish white and color ambiance ceiling light with Bluetooth',

package/devices/tuya.js

@@ -2229,6 +2229,23 @@ module.exports = [
                 .withDescription('Plug LED indicator mode'), e.child_lock()],
         onEvent: tuya.onEventMeasurementPoll,
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ntcy3xu1']),
+        model: 'TS0601_smoke_1',
+        vendor: 'TuYa',
+        description: 'Smoke sensor',
+        fromZigbee: [tuya.fzDataPoints],
+        toZigbee: [tuya.tzDataPoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [e.smoke(), e.tamper(), e.battery_low()],
+        meta: {
+            tuyaDatapoints: [
+                [1, 'smoke', tuya.valueConverter.true0ElseFalse],
+                [4, 'tamper', tuya.valueConverter.raw],
+                [14, 'battery_low', tuya.valueConverter.true0ElseFalse],
+            ],
+        },
+    },
     {
         zigbeeModel: ['5p1vj8r'],
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_t5p1vj8r'}, {modelID: 'TS0601', manufacturerName: '_TZE200_uebojraa'}],
@@ -2240,7 +2257,7 @@ module.exports = [
         exposes: [e.smoke(), e.battery()],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_5d3vhjro'}, {modelID: 'TS0601', manufacturerName: '_TZE200_ntcy3xu1'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_5d3vhjro'}],
         model: 'SA12IZL',
         vendor: 'TuYa',
         description: 'Smart smoke alarm',
@@ -2255,7 +2272,7 @@ module.exports = [
         onEvent: tuya.onEventsetTime,
     },
     {
-        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_lsanae15', '_TZE200_bkkmqmyo']),
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_lsanae15', '_TZE200_bkkmqmyo', '_TZE200_eaac7dkw']),
         model: 'TS0601_din_1',
         vendor: 'TuYa',
         description: 'Zigbee DIN energy meter',
@@ -2266,9 +2283,9 @@ module.exports = [
         meta: {
             tuyaDatapoints: [
                 [1, 'energy', tuya.valueConverter.divideBy100],
-                [6, null, tuya.valueConverterMultiProperty.phaseA], // voltage and current
+                [6, null, tuya.valueConverter.phaseA], // voltage and current
                 [16, 'state', tuya.valueConverter.onOff],
-                [103, 'power', tuya.valueConverterBasic.raw],
+                [103, 'power', tuya.valueConverter.raw],
                 [105, 'ac_frequency', tuya.valueConverter.divideBy100],
                 [111, 'power_factor', tuya.valueConverter.divideBy10],
                 // Ignored for now; we don't know what the values mean
@@ -3165,6 +3182,7 @@ module.exports = [
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_ikvncluo'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_lyetpprm'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_jva8ink8'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_wukb7rhc'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_ztc6ggyl'}],
         model: 'TS0601_smart_human_presense_sensor',

package/devices/ynoa.js

@@ -6,6 +6,13 @@ const e = exposes.presets;
 const extend = require('..//lib/extend');
 
 module.exports = [
+    {
+        zigbeeModel: ['ZBT-CCTLight-GU100001'],
+        model: '8718801528273',
+        vendor: 'Ynoa',
+        description: 'Smart LED GU10 CCT',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
     {
         zigbeeModel: ['ZBT-DIMSwitch-D0000'],
         model: '8718801528334',

package/lib/exposes.js

@@ -588,7 +588,8 @@ module.exports = {
         max_heat_setpoint_limit: (min, max, step) => new Numeric('max_heat_setpoint_limit', access.ALL).withUnit('°C').withDescription('Maximum Heating set point limit').withValueMin(min).withValueMax(max).withValueStep(step),
         min_heat_setpoint_limit: (min, max, step) => new Numeric('min_heat_setpoint_limit', access.ALL).withUnit('°C').withDescription('Minimum Heating set point limit').withValueMin(min).withValueMax(max).withValueStep(step),
         max_temperature: () => new Numeric('max_temperature', access.STATE_SET).withUnit('°C').withDescription('Maximum temperature').withValueMin(15).withValueMax(35),
-        max_temperature_limit: () => new Numeric('max_temperature_limit', access.STATE_SET).withUnit('°C').withDescription('Maximum temperature limit').withValueMin(0).withValueMax(35),
+        max_temperature_limit: () => new Numeric('max_temperature_limit', access.STATE_SET).withUnit('°C').withDescription('Maximum temperature limit. Cuts the thermostat out regardless of air temperature if the external floor sensor exceeds this temperature. Only used by the thermostat when in AL sensor mode.').withValueMin(20).withValueMax(70),
+        min_temperature_limit: () => new Numeric('min_temperature_limit', access.STATE_SET).withUnit('°C').withDescription('Minimum temperature limit for frost protection. Turns the thermostat on regardless of setpoint if the tempreature drops below this.').withValueMin(1).withValueMax(5),
         min_temperature: () => new Numeric('min_temperature', access.STATE_SET).withUnit('°C').withDescription('Minimum temperature').withValueMin(1).withValueMax(15),
         noise: () => new Numeric('noise', access.STATE).withUnit('dBA').withDescription('The measured noise value'),
         noise_detected: () => new Binary('noise_detected', access.STATE, true, false).withDescription('Indicates whether the device detected noise'),

package/lib/tuya.js

@@ -446,6 +446,7 @@ const dataPoints = {
     moesMaxTemp: 19,
     moesDeadZoneTemp: 20,
     moesLocalTemp: 24,
+    moesMinTempLimit: 26,
     moesTempCalibration: 27,
     moesValve: 36,
     moesChildLock: 40,
@@ -1183,7 +1184,9 @@ const valueConverterBasic = {
     scale: (min1, max1, min2, max2) => {
         return {to: (v) => utils.mapNumberRange(v, min1, max1, min2, max2), from: (v) => utils.mapNumberRange(v, min2, max2, min1, max1)};
     },
-    raw: {to: (v) => v, from: (v) => v},
+    raw: () => {
+        return {to: (v) => v, from: (v) => v};
+    },
     divideBy: (value) => {
         return {to: (v) => v * value, from: (v) => v / value};
     },
@@ -1199,15 +1202,14 @@ const valueConverter = {
     scale0_1to0_1000: valueConverterBasic.scale(0, 1, 0, 1000),
     divideBy100: valueConverterBasic.divideBy(100),
     divideBy10: valueConverterBasic.divideBy(10),
-};
-
-const valueConverterMultiProperty = {
+    raw: valueConverterBasic.raw(),
     phaseA: {
         from: (v) => {
             const buffer = Buffer.from(v, 'base64');
             return {voltage: (buffer[14] | buffer[13] << 8) / 10, current: (buffer[12] | buffer[11] << 8) / 1000};
         },
     },
+    true0ElseFalse: {from: (v) => v === 0},
 };
 
 const tzDataPoints = {
@@ -1270,9 +1272,8 @@ module.exports = {
     skip,
     configureMagicPacket,
     fingerprint,
-    valueConverterMultiProperty,
-    valueConverterBasic,
     valueConverter,
+    valueConverterBasic,
     tzDataPoints,
     fzDataPoints,
     sendDataPoint,

package/lib/utils.js

@@ -121,10 +121,12 @@ function postfixWithEndpointName(value, msg, definition, meta) {
     if (definition.meta && definition.meta.multiEndpoint) {
         const endpointName = definition.hasOwnProperty('endpoint') ?
             getKey(definition.endpoint(meta.device), msg.endpoint.ID) : msg.endpoint.ID;
-        return `${value}_${endpointName}`;
-    } else {
-        return value;
+
+        // NOTE: endpointName can be undefined if we have a definition.endpoint and the endpoint is
+        //       not listed.
+        if (endpointName) return `${value}_${endpointName}`;
     }
+    return value;
 }
 
 function getKey(object, value, fallback, convertTo) {

package/package.json

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