zigbee-herdsman-converters 15.0.16 → 15.0.17

package/devices/danfoss.js

@@ -63,12 +63,12 @@ module.exports = [
                     'from the `local_temperature` measured by the TRV by 5°C to 8°C. In this case you might choose to use an external ' +
                     'room sensor and send the measured value of the external room sensor to the `External_measured_room_sensor` property.' +
                     'The way the TRV operates on the `External_measured_room_sensor` depends on the setting of the `Radiator_covered` ' +
-                    'property: If `Radiator_covered` is `true` (Auto Offset Mode): You *must* set the `External_measured_room_sensor` ' +
+                    'property: If `Radiator_covered` is `false` (Auto Offset Mode): You *must* set the `External_measured_room_sensor` ' +
                     'property *at least* every 3 hours. After 3 hours the TRV disables this function and resets the value of the ' +
                     '`External_measured_room_sensor` property to -8000 (disabled). You *should* set the `External_measured_room_sensor` ' +
                     'property *at most* every 30 minutes or every 0.1K change in measured room temperature.' +
-                    'If `Radiator_covered` is `false` (Room Sensor Mode): You *must* set the `External_measured_room_sensor` property at ' +
-                    'least every 30 minutes. After 35 minutes the TRV disables this function and resets the value of the ' +
+                    'If `Radiator_covered` is `true` (Room Sensor Mode): You *must* set the `External_measured_room_sensor` property *at ' +
+                    'least* every 30 minutes. After 35 minutes the TRV disables this function and resets the value of the ' +
                     '`External_measured_room_sensor` property to -8000 (disabled). You *should* set the `External_measured_room_sensor` ' +
                     'property *at most* every 5 minutes or every 0.1K change in measured room temperature.')
                 .withValueMin(-8000).withValueMax(3500),

package/devices/dawon_dns.js

@@ -109,7 +109,7 @@ module.exports = [
         model: 'PM-S140-ZB',
         vendor: 'Dawon DNS',
         description: 'IOT smart switch 1 gang without neutral wire',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
@@ -159,7 +159,7 @@ module.exports = [
         model: 'PM-S140R-ZB',
         vendor: 'Dawon DNS',
         description: 'IOT smart switch 1 gang router without neutral wire',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
@@ -209,7 +209,7 @@ module.exports = [
         model: 'PM-S150-ZB',
         vendor: 'Dawon DNS',
         description: 'IOT smart switch 1 gang router without neutral wire',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);

package/devices/heiman.js

@@ -122,7 +122,7 @@ module.exports = [
     {
         zigbeeModel: ['RH3070'],
         model: 'HS1CG',
-        vendor: 'Heiman',
+        vendor: 'HEIMAN',
         description: 'Smart combustible gas sensor',
         fromZigbee: [fz.ias_gas_alarm_1],
         toZigbee: [],
@@ -403,7 +403,7 @@ module.exports = [
         zigbeeModel: ['STHM-I1H'],
         model: 'STHM-I1H',
         vendor: 'HEIMAN',
-        description: 'Heiman temperature & humidity sensor',
+        description: 'Temperature & humidity sensor',
         fromZigbee: [fz.temperature, fz.humidity, fz.battery],
         toZigbee: [],
         meta: {battery: {voltageToPercentage: '3V_2500'}},

package/devices/hilux.js

@@ -0,0 +1,11 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['Hilux DZ8'],
+        model: 'DZ8',
+        vendor: 'Hilux',
+        description: 'Spot 7W',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370], disablePowerOnBehavior: true}),
+    },
+];

package/devices/iris.js

@@ -111,7 +111,7 @@ module.exports = [
         meta: {battery: {voltageToPercentage: '3V_2100'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genPowerCfg', 'msTemperatureMeasurement']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'msTemperatureMeasurement']);
             await reporting.onOff(endpoint);
             await reporting.batteryVoltage(endpoint);
             await reporting.temperature(endpoint);

package/devices/legrand.js

@@ -253,6 +253,7 @@ module.exports = [
             await reporting.onOff(endpoint);
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
             await reporting.activePower(endpoint);
+            await reporting.apparentPower(endpoint);
         },
     },
     {
@@ -310,6 +311,7 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['haElectricalMeasurement', 'genIdentify']);
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
             await reporting.activePower(endpoint);
+            await reporting.apparentPower(endpoint);
             // Read configuration values that are not sent periodically as well as current power (activePower).
             await endpoint.read('haElectricalMeasurement', ['activePower', 0xf000, 0xf001, 0xf002]);
         },
@@ -377,6 +379,7 @@ module.exports = [
             exposes.enum('cable_outlet_mode', ea.ALL, ['comfort', 'comfort-1', 'comfort-2', 'eco', 'frost_protection', 'off']),
             exposes.switch().withState('state', true, 'Works only when the pilot wire is deactivated'),
             e.power().withAccess(ea.STATE_GET),
+            e.power_apparent(),
             e.power_on_behavior().withDescription(`Controls the behavior when the device is powered on. Works only when the pilot wire is
                 deactivated`)],
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -385,6 +388,7 @@ module.exports = [
             await reporting.onOff(endpoint);
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
             await reporting.activePower(endpoint);
+            await reporting.apparentPower(endpoint);
         },
     },
     {

package/devices/nodon.js

@@ -47,6 +47,9 @@ module.exports = [
             await reporting.bind(ep, coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(ep);
         },
+        endpoint: (device) => {
+            return {default: 1};
+        },
     },
     {
         zigbeeModel: ['SIN-4-2-20'],

package/devices/philips.js

@@ -1379,14 +1379,14 @@ module.exports = [
         model: '8718696598283',
         vendor: 'Philips',
         description: 'Hue white ambiance GU10',
-        extend: hueExtend.light_onoff_brightness_colortemp(),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
     {
         zigbeeModel: ['LTG002'],
         model: '929001953301',
         vendor: 'Philips',
         description: 'Hue white ambiance GU10 with Bluetooth',
-        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 500], disableHueEffects: false}),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454], disableHueEffects: false}),
     },
     {
         zigbeeModel: ['LTD005'],
@@ -1400,7 +1400,7 @@ module.exports = [
         model: '9290019534',
         vendor: 'Philips',
         description: 'Hue white ambiance GU10 with Bluetooth',
-        extend: hueExtend.light_onoff_brightness_colortemp(),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
     {
         zigbeeModel: ['3417831P6', '929003056101'],
@@ -1955,6 +1955,13 @@ module.exports = [
         description: 'Hue Gradient Signe floor lamp (white)',
         extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['915005987701'],
+        model: '915005987701',
+        vendor: 'Philips',
+        description: 'Hue Gradient Signe floor lamp (wood)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['LCT020'],
         model: '4080148P7',

package/devices/sinope.js

@@ -724,19 +724,25 @@ module.exports = [
         description: 'Zigbee low volt thermostat',
         fromZigbee: [fzLocal.thermostat, fzLocal.sinope, fz.legacy.hvac_user_interface,
             fz.electrical_measurement, fz.metering, fz.ignore_temperature_report],
-        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_temperature_display_mode,
-            tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tzLocal.backlight_autodim, tzLocal.thermostat_time,
-            tzLocal.time_format, tzLocal.enable_outdoor_temperature, tzLocal.outdoor_temperature, tzLocal.floor_control_mode,
-            tzLocal.ambiant_max_heat_setpoint, tzLocal.floor_min_heat_setpoint, tzLocal.floor_max_heat_setpoint, tzLocal.temperature_sensor,
-            tz.thermostat_min_heat_setpoint_limit, tz.thermostat_max_heat_setpoint_limit, tzLocal.connected_load,
-            tzLocal.aux_connected_load, tzLocal.main_cycle_output, tzLocal.aux_cycle_output, tzLocal.pump_protection],
+        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
+            tz.thermostat_temperature_display_mode, tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tzLocal.backlight_autodim,
+            tzLocal.thermostat_time, tzLocal.time_format, tzLocal.enable_outdoor_temperature, tzLocal.outdoor_temperature,
+            tzLocal.thermostat_occupancy, tzLocal.floor_control_mode, tzLocal.ambiant_max_heat_setpoint, tzLocal.floor_min_heat_setpoint,
+            tzLocal.floor_max_heat_setpoint, tzLocal.temperature_sensor, tz.thermostat_min_heat_setpoint_limit,
+            tz.thermostat_max_heat_setpoint_limit, tzLocal.connected_load, tzLocal.aux_connected_load, tzLocal.main_cycle_output,
+            tzLocal.aux_cycle_output, tzLocal.pump_protection],
         exposes: [
             exposes.climate()
                 .withSetpoint('occupied_heating_setpoint', 5, 36, 0.5)
+                .withSetpoint('unoccupied_heating_setpoint', 5, 36, 0.5)
                 .withLocalTemperature()
                 .withSystemMode(['off', 'heat'])
                 .withPiHeatingDemand()
                 .withRunningState(['idle', 'heat'], ea.STATE),
+            e.max_heat_setpoint_limit(5, 36, 0.5),
+            e.min_heat_setpoint_limit(5, 36, 0.5),
+            exposes.enum('thermostat_occupancy', ea.ALL, ['unoccupied', 'occupied'])
+                .withDescription('Occupancy state of the thermostat'),
             exposes.binary('enable_outdoor_temperature', ea.ALL, 'ON', 'OFF')
                 .withDescription('Showing outdoor temperature on secondary display'),
             exposes.enum('temperature_display_mode', ea.ALL, ['celsius', 'fahrenheit'])
@@ -747,34 +753,21 @@ module.exports = [
                 .withDescription('The display backlight behavior'),
             exposes.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1'])
                 .withDescription('Enables or disables the device’s buttons'),
-            exposes.presets.max_heat_setpoint_limit(5, 36, 0.5),
-            exposes.presets.min_heat_setpoint_limit(5, 36, 0.5),
             exposes.numeric('connected_load', ea.ALL)
-                .withUnit('W')
-                .withValueMin(1)
-                .withValueMax(20000)
+                .withUnit('W').withValueMin(1).withValueMax(20000)
                 .withDescription('The power in watts of the electrical load connected to the device'),
             exposes.enum('floor_control_mode', ea.ALL, ['ambiant', 'floor'])
                 .withDescription('Control mode using floor or ambient temperature'),
             exposes.numeric('floor_max_heat_setpoint', ea.ALL)
-                .withUnit('°C')
-                .withValueMin(7)
-                .withValueMax(36)
-                .withValueStep(0.5)
+                .withUnit('°C').withValueMin(7).withValueMax(36).withValueStep(0.5)
                 .withPreset('off', 'off', 'Use minimum permitted value')
                 .withDescription('The maximum floor temperature limit of the floor when in ambient control mode'),
             exposes.numeric('floor_min_heat_setpoint', ea.ALL)
-                .withUnit('°C')
-                .withValueMin(5)
-                .withValueMax(34)
-                .withValueStep(0.5)
+                .withUnit('°C').withValueMin(5).withValueMax(34).withValueStep(0.5)
                 .withPreset('off', 'off', 'Use minimum permitted value')
                 .withDescription('The minimum floor temperature limit of the floor when in ambient control mode'),
             exposes.numeric('ambiant_max_heat_setpoint', ea.ALL)
-                .withUnit('°C')
-                .withValueMin(5)
-                .withValueMax(36)
-                .withValueStep(0.5)
+                .withUnit('°C').withValueMin(5).withValueMax(36).withValueStep(0.5)
                 .withPreset('off', 'off', 'Use minimum permitted value')
                 .withDescription('The maximum ambient temperature limit when in floor control mode'),
             exposes.enum('floor_temperature_sensor', ea.ALL, ['10k', '12k'])
@@ -786,9 +779,7 @@ module.exports = [
             exposes.binary('pump_protection', ea.ALL, 'ON', 'OFF')
                 .withDescription('This function prevents the seizure of the pump'),
             exposes.numeric('aux_connected_load', ea.ALL)
-                .withUnit('W')
-                .withValueMin(0)
-                .withValueMax(20000)
+                .withUnit('W').withValueMin(0).withValueMax(20000)
                 .withDescription('The power in watts of the heater connected to the auxiliary output of the thermostat'),
         ],
 
@@ -929,18 +920,16 @@ module.exports = [
         description: 'Zigbee smart plug',
         fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
         toZigbee: [tz.on_off, tz.frequency],
-        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.ac_frequency().withAccess(ea.STATE_GET)],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = ['genBasic', 'genIdentify', 'genOnOff', 'haElectricalMeasurement', 'seMetering'];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint, {readFrequencyAttrs: true});
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
             await reporting.onOff(endpoint);
             await reporting.activePower(endpoint, {min: 10, max: 305, change: 1}); // divider 10 : 0.1W
             await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 10}); // divider 100: 0.1Arms
             await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 10}); // divider 100: 0.1Vrms
-            await reporting.acFrequency(endpoint, {min: 10, max: 308, change: 100}); // divider 100: 1Hz
-            await endpoint.read('haElectricalMeasurement', ['acFrequency']); // get a first read
             await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [1, 1]});
         },
     },
@@ -951,18 +940,16 @@ module.exports = [
         description: 'Zigbee smart plug',
         fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
         toZigbee: [tz.on_off, tz.frequency],
-        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.ac_frequency().withAccess(ea.STATE_GET)],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = ['genBasic', 'genIdentify', 'genOnOff', 'haElectricalMeasurement', 'seMetering'];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint, {readFrequencyAttrs: true});
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
             await reporting.onOff(endpoint);
             await reporting.activePower(endpoint, {min: 10, max: 305, change: 1}); // divider 10 : 0.1W
             await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 10}); // divider 100: 0.1Arms
             await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 10}); // divider 100: 0.1Vrms
-            await reporting.acFrequency(endpoint, {min: 10, max: 308, change: 100}); // divider 100: 1Hz
-            await endpoint.read('haElectricalMeasurement', ['acFrequency']); // get a first read
             await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [1, 1]});
         },
     },

package/devices/tuya.js

@@ -1253,10 +1253,10 @@ module.exports = [
         fromZigbee: [tuya.fz.datapoints],
         toZigbee: [tuya.tz.datapoints],
         configure: tuya.configureMagicPacket,
-        exposes: [e.temperature(), e.humidity(), tuya.exposes.temperatureUnit(), e.battery(), tuya.exposes.batteryState()],
+        exposes: [e.temperature(), e.soil_moisture(), tuya.exposes.temperatureUnit(), e.battery(), tuya.exposes.batteryState()],
         meta: {
             tuyaDatapoints: [
-                [3, 'humidity', tuya.valueConverter.raw],
+                [3, 'soil_moisture', tuya.valueConverter.raw],
                 [5, 'temperature', tuya.valueConverter.raw],
                 [9, 'temperature_unit', tuya.valueConverter.temperatureUnit],
                 [14, 'battery_state', tuya.valueConverter.batteryState],
@@ -1881,6 +1881,30 @@ module.exports = [
         exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy(), tuya.exposes.switchType(),
             exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore']).withDescription('Recover state after power outage')],
     },
+    {
+        fingerprint: [{modelID: 'TS0002', manufacturerName: '_TZ3000_irrmjcgi'}],
+        model: 'TS0002_power',
+        vendor: 'TuYa',
+        description: '2 gang switch with power monitoring',
+        extend: tuya.extend.switch({switchType: true, endpoints: ['l1', 'l2'], electricalMeasurements: true}),
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2};
+        },
+        meta: {multiEndpoint: true, multiEndpointSkip: ['energy', 'current', 'voltage', 'power']},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.rmsVoltage(endpoint, {change: 5});
+            await reporting.rmsCurrent(endpoint, {change: 50});
+            await reporting.activePower(endpoint, {change: 10});
+            await reporting.currentSummDelivered(endpoint);
+            endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {acCurrentDivisor: 1000, acCurrentMultiplier: 1});
+            endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
+            device.save();
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+        },
+    },
     {
         fingerprint: tuya.fingerprint('TS000F', ['_TZ3000_xkap8wtb']),
         model: 'TS000F_power',
@@ -1935,7 +1959,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0001', manufacturerName: '_TZ3000_tqlv4ug4'}],
+        fingerprint: [{modelID: 'TS0001', manufacturerName: '_TZ3000_tqlv4ug4'}, {modelID: 'TS0001', manufacturerName: '_TZ3000_gjrubzje'}],
         model: 'TS0001_switch_module',
         vendor: 'TuYa',
         description: '1 gang switch module',

package/devices/ubisys.js

@@ -86,7 +86,7 @@ const ubisys = {
             cluster: 'manuSpecificUbisysDeviceSetup',
             type: ['attributeReport', 'readResponse'],
             convert: (model, msg, publish, options, meta) => {
-                const result = {};
+                const result = meta.state.hasOwnProperty('configure_device_setup') ? meta.state.configure_device_setup : {};
                 if (msg.data['inputConfigurations'] != null) {
                     result['input_configurations'] = msg.data['inputConfigurations'];
                 }
@@ -501,7 +501,7 @@ const ubisys = {
                         endpoint += 1;
                     }
 
-                    meta.logger.debug(`ubisys: input_actions to be sent to '${meta.options.friendlyName}': ` +
+                    meta.logger.debug(`ubisys: input_actions to be sent to '${meta.options.friendly_name}': ` +
                         JSON.stringify(resultingInputActions));
                     await devMgmtEp.write(
                         'manuSpecificUbisysDeviceSetup',
@@ -511,12 +511,14 @@ const ubisys = {
                 }
 
                 // re-read effective settings and dump them to the log
-                ubisys.tz.configure_device_setup.convertGet(entity, key, meta);
+                await ubisys.tz.configure_device_setup.convertGet(entity, key, meta);
             },
 
             convertGet: async (entity, key, meta) => {
                 const devMgmtEp = meta.device.getEndpoint(232);
-                await devMgmtEp.read('manuSpecificUbisysDeviceSetup', ['inputConfigurations', 'inputActions'],
+                await devMgmtEp.read('manuSpecificUbisysDeviceSetup', ['inputConfigurations'],
+                    manufacturerOptions.ubisysNull);
+                await devMgmtEp.read('manuSpecificUbisysDeviceSetup', ['inputActions'],
                     manufacturerOptions.ubisysNull);
             },
         },

package/lib/reporting.js

@@ -202,6 +202,10 @@ module.exports = {
         const p = payload('activePower', 5, repInterval.HOUR, 1, overrides);
         await endpoint.configureReporting('haElectricalMeasurement', p);
     },
+    apparentPower: async (endpoint, overrides) => {
+        const p = payload('apparentPower', 5, repInterval.HOUR, 1, overrides);
+        await endpoint.configureReporting('haElectricalMeasurement', p);
+    },
     rmsCurrent: async (endpoint, overrides) => {
         const p = payload('rmsCurrent', 5, repInterval.HOUR, 1, overrides);
         await endpoint.configureReporting('haElectricalMeasurement', p);

package/package.json

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