zigbee-herdsman-converters 14.0.662 → 14.0.663

package/devices/ledvance.js

@@ -21,6 +21,9 @@ module.exports = [
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(endpoint);
+            // Has Unknown power source, force it here.
+            device.powerSource = 'Mains (single phase)';
+            device.save();
         },
     },
     {

package/devices/leviton.js

@@ -3,9 +3,24 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+const utils = require('../lib/utils');
 const e = exposes.presets;
 const ea = exposes.access;
 
+const fzLocal = {
+    on_off_via_brightness: {
+        cluster: 'genLevelCtrl',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data.hasOwnProperty('currentLevel')) {
+                const currentLevel = Number(msg.data['currentLevel']);
+                const property = utils.postfixWithEndpointName('state', msg, model, meta);
+                return {[property]: currentLevel > 0 ? 'ON' : 'OFF'};
+            }
+        },
+    },
+};
+
 module.exports = [
     {
         zigbeeModel: ['DL15S'],
@@ -91,21 +106,24 @@ module.exports = [
         model: 'ZS057-D0Z',
         vendor: 'Leviton',
         description: 'Wall switch, 0-10V dimmer, 120-277V, Lumina™ RF',
+        meta: {disableDefaultResponse: true},
         extend: extend.light_onoff_brightness({disableEffect: true, noConfigure: true}),
-        fromZigbee: [fz.brightness, fz.identify, fz.lighting_ballast_configuration, fz.level_config],
-        toZigbee: [tz.light_onoff_brightness, tz.ballast_config, tz.level_config],
+        fromZigbee: [fz.on_off, fzLocal.on_off_via_brightness, fz.lighting_ballast_configuration],
+        toZigbee: [tz.light_onoff_brightness, tz.ballast_config],
         exposes: [e.light_brightness(),
+            // Note: ballast_power_on_level used to be here, but it does't appear to work properly with this device
+            // If set, it's reset back to 0 when the device is turned off then back to 32 when turned on
             exposes.numeric('ballast_minimum_level', ea.ALL).withValueMin(1).withValueMax(254)
                 .withDescription('Specifies the minimum brightness value'),
             exposes.numeric('ballast_maximum_level', ea.ALL).withValueMin(1).withValueMax(254)
-                .withDescription('Specifies the maximum brightness value'),
-            exposes.numeric('ballast_power_on_level', ea.ALL).withValueMin(1).withValueMax(254)
-                .withDescription('Specifies the initialisation light level. Can not be set lower than "ballast_minimum_level"')],
+                .withDescription('Specifies the maximum brightness value')],
         configure: async (device, coordinatorEndpoint, logger) => {
-            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'lightingBallastCfg']);
-            await reporting.onOff(endpoint);
+            // This device doesn't reliably report state changes - make it chatty to compensate for that
+            // This feels like a hack - hopefully there is a better fix at some point
+            await reporting.onOff(endpoint, {max: 5});
+            await reporting.brightness(endpoint, {max: 5});
         },
     },
 ];

package/devices/stelpro.js

@@ -5,7 +5,51 @@ const reporting = require('../lib/reporting');
 const e = exposes.presets;
 const constants = require('../lib/constants');
 
+const fzLocal = {
+    power: {
+        cluster: 'hvacThermostat',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data.hasOwnProperty('16392')) {
+                return {power: msg.data['16392']};
+            }
+        },
+    },
+    energy: {
+        cluster: 'hvacThermostat',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            if (msg.data.hasOwnProperty('16393')) {
+                return {energy: parseFloat(msg.data['16393']) / 1000};
+            }
+        },
+    },
+};
+
 module.exports = [
+    {
+        zigbeeModel: ['HT402'],
+        model: 'HT402',
+        vendor: 'Stelpro',
+        description: 'Hilo thermostat',
+        fromZigbee: [fz.stelpro_thermostat, fz.hvac_user_interface, fzLocal.power, fzLocal.energy],
+        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_occupancy, tz.thermostat_occupied_heating_setpoint,
+            tz.thermostat_temperature_display_mode, tz.thermostat_keypad_lockout, tz.thermostat_system_mode,
+            tz.thermostat_running_state, tz.stelpro_thermostat_outdoor_temperature],
+        exposes: [e.local_temperature(), e.keypad_lockout(), e.power(), e.energy(),
+            exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 30, 0.5).withLocalTemperature()
+                .withSystemMode(['heat']).withRunningState(['idle', 'heat'])],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(25);
+            const binds = ['genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg', 'msTemperatureMeasurement'];
+            await reporting.bind(endpoint, coordinatorEndpoint, binds);
+            await reporting.thermostatTemperature(endpoint);
+            await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
+            await reporting.thermostatSystemMode(endpoint);
+            await reporting.thermostatPIHeatingDemand(endpoint);
+            await reporting.thermostatKeypadLockMode(endpoint);
+        },
+    },
     {
         zigbeeModel: ['ST218'],
         model: 'ST218',

package/package.json

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