zigbee-herdsman-converters 20.13.0 → 20.14.1

package/devices/sinope.js

@@ -32,12 +32,12 @@ const toZigbee_1 = __importDefault(require("../converters/toZigbee"));
 const constants = __importStar(require("../lib/constants"));
 const exposes = __importStar(require("../lib/exposes"));
 const legacy = __importStar(require("../lib/legacy"));
+const modernExtend_1 = require("../lib/modernExtend");
 const reporting = __importStar(require("../lib/reporting"));
 const utils = __importStar(require("../lib/utils"));
+const utils_1 = require("../lib/utils");
 const e = exposes.presets;
 const ea = exposes.access;
-const modernExtend_1 = require("../lib/modernExtend");
-const utils_1 = require("../lib/utils");
 const manuSinope = { manufacturerCode: zigbee_herdsman_1.Zcl.ManufacturerCode.SINOPE_TECHNOLOGIES };
 const fzLocal = {
     ias_water_leak_alarm: {
@@ -57,77 +57,77 @@ const fzLocal = {
         type: ['attributeReport', 'readResponse'],
         options: [exposes.options.legacy()],
         convert: (model, msg, publish, options, meta) => {
-            // @ts-expect-error
+            // @ts-expect-error ignore
             delete msg['running_state'];
             const result = {};
             const occupancyLookup = { 0: 'unoccupied', 1: 'occupied' };
             const cycleOutputLookup = { 15: '15_sec', 300: '5_min', 600: '10_min', 900: '15_min', 1200: '20_min', 1800: '30_min', 65535: 'off' };
-            if (msg.data.hasOwnProperty('1024')) {
+            if (msg.data['1024'] !== undefined) {
                 result.thermostat_occupancy = utils.getFromLookup(msg.data['1024'], occupancyLookup);
             }
-            if (msg.data.hasOwnProperty('SinopeOccupancy')) {
+            if (msg.data.SinopeOccupancy !== undefined) {
                 result.thermostat_occupancy = utils.getFromLookup(msg.data['SinopeOccupancy'], occupancyLookup);
             }
-            if (msg.data.hasOwnProperty('1025')) {
+            if (msg.data['1025'] !== undefined) {
                 result.main_cycle_output = utils.getFromLookup(msg.data['1025'], cycleOutputLookup);
             }
-            if (msg.data.hasOwnProperty('SinopeMainCycleOutput')) {
+            if (msg.data.SinopeMainCycleOutput !== undefined) {
                 result.main_cycle_output = utils.getFromLookup(msg.data['SinopeMainCycleOutput'], cycleOutputLookup);
             }
-            if (msg.data.hasOwnProperty('1026')) {
+            if (msg.data['1026'] !== undefined) {
                 const lookup = { 0: 'on_demand', 1: 'sensing' };
                 result.backlight_auto_dim = utils.getFromLookup(msg.data['1026'], lookup);
             }
-            if (msg.data.hasOwnProperty('SinopeBacklight')) {
+            if (msg.data.SinopeBacklight !== undefined) {
                 const lookup = { 0: 'on_demand', 1: 'sensing' };
                 result.backlight_auto_dim = utils.getFromLookup(msg.data['SinopeBacklight'], lookup);
             }
-            if (msg.data.hasOwnProperty('1028')) {
+            if (msg.data['1028'] !== undefined) {
                 result.aux_cycle_output = utils.getFromLookup(msg.data['1028'], cycleOutputLookup);
             }
-            if (msg.data.hasOwnProperty('localTemp')) {
+            if (msg.data.localTemp !== undefined) {
                 result.local_temperature = (0, utils_1.precisionRound)(msg.data['localTemp'], 2) / 100;
             }
-            if (msg.data.hasOwnProperty('localTemperatureCalibration')) {
+            if (msg.data.localTemperatureCalibration !== undefined) {
                 result.local_temperature_calibration = (0, utils_1.precisionRound)(msg.data['localTemperatureCalibration'], 2) / 10;
             }
-            if (msg.data.hasOwnProperty('outdoorTemp')) {
+            if (msg.data.outdoorTemp !== undefined) {
                 result.outdoor_temperature = (0, utils_1.precisionRound)(msg.data['outdoorTemp'], 2) / 100;
             }
-            if (msg.data.hasOwnProperty('occupiedHeatingSetpoint')) {
+            if (msg.data.occupiedHeatingSetpoint !== undefined) {
                 result.occupied_heating_setpoint = (0, utils_1.precisionRound)(msg.data['occupiedHeatingSetpoint'], 2) / 100;
             }
-            if (msg.data.hasOwnProperty('unoccupiedHeatingSetpoint')) {
+            if (msg.data.unoccupiedHeatingSetpoint !== undefined) {
                 result.unoccupied_heating_setpoint = (0, utils_1.precisionRound)(msg.data['unoccupiedHeatingSetpoint'], 2) / 100;
             }
-            if (msg.data.hasOwnProperty('occupiedCoolingSetpoint')) {
+            if (msg.data.occupiedCoolingSetpoint !== undefined) {
                 result.occupied_cooling_setpoint = (0, utils_1.precisionRound)(msg.data['occupiedCoolingSetpoint'], 2) / 100;
             }
-            if (msg.data.hasOwnProperty('unoccupiedCoolingSetpoint')) {
+            if (msg.data.unoccupiedCoolingSetpoint !== undefined) {
                 result.unoccupied_cooling_setpoint = (0, utils_1.precisionRound)(msg.data['unoccupiedCoolingSetpoint'], 2) / 100;
             }
-            if (msg.data.hasOwnProperty('ctrlSeqeOfOper')) {
+            if (msg.data.ctrlSeqeOfOper !== undefined) {
                 result.control_sequence_of_operation = constants.thermostatControlSequenceOfOperations[msg.data['ctrlSeqeOfOper']];
             }
-            if (msg.data.hasOwnProperty('systemMode')) {
+            if (msg.data.systemMode !== undefined) {
                 result.system_mode = constants.thermostatSystemModes[msg.data['systemMode']];
             }
-            if (msg.data.hasOwnProperty('pIHeatingDemand')) {
+            if (msg.data.pIHeatingDemand !== undefined) {
                 result.pi_heating_demand = (0, utils_1.precisionRound)(msg.data['pIHeatingDemand'], 0);
             }
-            if (msg.data.hasOwnProperty('minHeatSetpointLimit')) {
+            if (msg.data.minHeatSetpointLimit !== undefined) {
                 result.min_heat_setpoint_limit = (0, utils_1.precisionRound)(msg.data['minHeatSetpointLimit'], 2) / 100;
             }
-            if (msg.data.hasOwnProperty('maxHeatSetpointLimit')) {
+            if (msg.data.maxHeatSetpointLimit !== undefined) {
                 result.max_heat_setpoint_limit = (0, utils_1.precisionRound)(msg.data['maxHeatSetpointLimit'], 2) / 100;
             }
-            if (msg.data.hasOwnProperty('absMinHeatSetpointLimit')) {
+            if (msg.data.absMinHeatSetpointLimit !== undefined) {
                 result.abs_min_heat_setpoint_limit = (0, utils_1.precisionRound)(msg.data['absMinHeatSetpointLimit'], 2) / 100;
             }
-            if (msg.data.hasOwnProperty('absMaxHeatSetpointLimit')) {
+            if (msg.data.absMaxHeatSetpointLimit !== undefined) {
                 result.abs_max_heat_setpoint_limit = (0, utils_1.precisionRound)(msg.data['absMaxHeatSetpointLimit'], 2) / 100;
             }
-            if (msg.data.hasOwnProperty('pIHeatingDemand')) {
+            if (msg.data.pIHeatingDemand !== undefined) {
                 result.running_state = msg.data['pIHeatingDemand'] >= 10 ? 'heat' : 'idle';
             }
             return result;
@@ -138,7 +138,7 @@ const fzLocal = {
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
             const result = {};
-            if (msg.data.hasOwnProperty('presentValue')) {
+            if (msg.data.presentValue !== undefined) {
                 let x = msg.data['presentValue'];
                 if (x == -1) {
                     result.tank_level = 0;
@@ -169,84 +169,84 @@ const fzLocal = {
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
             const result = {};
-            if (msg.data.hasOwnProperty('GFCiStatus')) {
+            if (msg.data.GFCiStatus !== undefined) {
                 const lookup = { 0: 'off', 1: 'on' };
                 result.gfci_status = utils.getFromLookup(msg.data['GFCiStatus'], lookup);
             }
-            if (msg.data.hasOwnProperty('floorLimitStatus')) {
+            if (msg.data.floorLimitStatus !== undefined) {
                 const lookup = { 0: 'off', 1: 'on' };
                 result.floor_limit_status = utils.getFromLookup(msg.data['floorLimitStatus'], lookup);
             }
-            if (msg.data.hasOwnProperty('secondScreenBehavior')) {
+            if (msg.data.secondScreenBehavior !== undefined) {
                 const lookup = { 0: 'auto', 1: 'setpoint', 2: 'outdoor temp' };
                 result.second_display_mode = utils.getFromLookup(msg.data['secondScreenBehavior'], lookup);
             }
-            if (msg.data.hasOwnProperty('outdoorTempToDisplayTimeout')) {
+            if (msg.data.outdoorTempToDisplayTimeout !== undefined) {
                 result.outdoor_temperature_timeout = msg.data['outdoorTempToDisplayTimeout'];
                 // DEPRECATED: Use Second Display Mode or control via set outdoorTempToDisplayTimeout
                 result.enable_outdoor_temperature = msg.data['outdoorTempToDisplayTimeout'] === 12 ? 'OFF' : 'ON';
             }
-            if (msg.data.hasOwnProperty('outdoorTempToDisplay')) {
+            if (msg.data.outdoorTempToDisplay !== undefined) {
                 result.thermostat_outdoor_temperature = (0, utils_1.precisionRound)(msg.data['outdoorTempToDisplay'], 2) / 100;
             }
-            if (msg.data.hasOwnProperty('currentTimeToDisplay')) {
+            if (msg.data.currentTimeToDisplay !== undefined) {
                 result.current_time_to_display = msg.data['currentTimeToDisplay'];
             }
-            if (msg.data.hasOwnProperty('floorControlMode')) {
+            if (msg.data.floorControlMode !== undefined) {
                 const lookup = { 1: 'ambiant', 2: 'floor' };
                 result.floor_control_mode = utils.getFromLookup(msg.data['floorControlMode'], lookup);
             }
-            if (msg.data.hasOwnProperty('ambiantMaxHeatSetpointLimit')) {
+            if (msg.data.ambiantMaxHeatSetpointLimit !== undefined) {
                 result.ambiant_max_heat_setpoint = msg.data['ambiantMaxHeatSetpointLimit'] / 100.0;
                 if (result.ambiant_max_heat_setpoint === -327.68) {
                     result.ambiant_max_heat_setpoint = 'off';
                 }
             }
-            if (msg.data.hasOwnProperty('floorMinHeatSetpointLimit')) {
+            if (msg.data.floorMinHeatSetpointLimit !== undefined) {
                 result.floor_min_heat_setpoint = msg.data['floorMinHeatSetpointLimit'] / 100.0;
                 if (result.floor_min_heat_setpoint === -327.68) {
                     result.floor_min_heat_setpoint = 'off';
                 }
             }
-            if (msg.data.hasOwnProperty('floorMaxHeatSetpointLimit')) {
+            if (msg.data.floorMaxHeatSetpointLimit !== undefined) {
                 result.floor_max_heat_setpoint = msg.data['floorMaxHeatSetpointLimit'] / 100.0;
                 if (result.floor_max_heat_setpoint === -327.68) {
                     result.floor_max_heat_setpoint = 'off';
                 }
             }
-            if (msg.data.hasOwnProperty('temperatureSensor')) {
+            if (msg.data.temperatureSensor !== undefined) {
                 const lookup = { 0: '10k', 1: '12k' };
                 result.floor_temperature_sensor = utils.getFromLookup(msg.data['temperatureSensor'], lookup);
             }
-            if (msg.data.hasOwnProperty('timeFormatToDisplay')) {
+            if (msg.data.timeFormatToDisplay !== undefined) {
                 const lookup = { 0: '24h', 1: '12h' };
                 result.time_format = utils.getFromLookup(msg.data['timeFormatToDisplay'], lookup);
             }
-            if (msg.data.hasOwnProperty('connectedLoad')) {
+            if (msg.data.connectedLoad !== undefined) {
                 result.connected_load = msg.data['connectedLoad'];
             }
-            if (msg.data.hasOwnProperty('auxConnectedLoad')) {
+            if (msg.data.auxConnectedLoad !== undefined) {
                 result.aux_connected_load = msg.data['auxConnectedLoad'];
                 if (result.aux_connected_load == 65535) {
                     result.aux_connected_load = 'disabled';
                 }
             }
-            if (msg.data.hasOwnProperty('pumpProtection')) {
+            if (msg.data.pumpProtection !== undefined) {
                 result.pump_protection = msg.data['pumpProtection'] == 1 ? 'ON' : 'OFF';
             }
-            if (msg.data.hasOwnProperty('dimmerTimmer')) {
+            if (msg.data.dimmerTimmer !== undefined) {
                 result.timer_seconds = msg.data['dimmerTimmer'];
             }
-            if (msg.data.hasOwnProperty('ledIntensityOn')) {
+            if (msg.data.ledIntensityOn !== undefined) {
                 result.led_intensity_on = msg.data['ledIntensityOn'];
             }
-            if (msg.data.hasOwnProperty('ledIntensityOff')) {
+            if (msg.data.ledIntensityOff !== undefined) {
                 result.led_intensity_off = msg.data['ledIntensityOff'];
             }
-            if (msg.data.hasOwnProperty('minimumBrightness')) {
+            if (msg.data.minimumBrightness !== undefined) {
                 result.minimum_brightness = msg.data['minimumBrightness'];
             }
-            if (msg.data.hasOwnProperty('actionReport')) {
+            if (msg.data.actionReport !== undefined) {
                 const lookup = {
                     1: 'up_clickdown',
                     2: 'up_single',
@@ -259,11 +259,11 @@ const fzLocal = {
                 };
                 result.action = utils.getFromLookup(msg.data['actionReport'], lookup);
             }
-            if (msg.data.hasOwnProperty('keypadLockout')) {
+            if (msg.data.keypadLockout !== undefined) {
                 const lookup = { 0: 'unlock', 1: 'lock' };
                 result.keypad_lockout = utils.getFromLookup(msg.data['keypadLockout'], lookup);
             }
-            if (msg.data.hasOwnProperty('drConfigWaterTempMin')) {
+            if (msg.data.drConfigWaterTempMin !== undefined) {
                 result.low_water_temp_protection = msg.data['drConfigWaterTempMin'];
             }
             return result;
@@ -397,8 +397,8 @@ const tzLocal = {
             }
             const lookup = { ambiant: 1, floor: 2 };
             value = value.toLowerCase();
-            // @ts-expect-error
-            if (lookup.hasOwnProperty(value)) {
+            // @ts-expect-error ignore
+            if (lookup[value] !== undefined) {
                 await entity.write('manuSpecificSinope', { floorControlMode: utils.getFromLookup(value, lookup) });
             }
             return { readAfterWriteTime: 250, state: { floor_control_mode: value } };
@@ -411,9 +411,9 @@ const tzLocal = {
         // TH1300ZB and TH1400ZB specific
         key: ['ambiant_max_heat_setpoint'],
         convertSet: async (entity, key, value, meta) => {
-            // @ts-expect-error
+            // @ts-expect-error ignore
             if ((value >= 5 && value <= 36) || value == 'off') {
-                // @ts-expect-error
+                // @ts-expect-error ignore
                 await entity.write('manuSpecificSinope', { ambiantMaxHeatSetpointLimit: value == 'off' ? -32768 : value * 100 });
                 return { readAfterWriteTime: 250, state: { ambiant_max_heat_setpoint: value } };
             }
@@ -426,9 +426,9 @@ const tzLocal = {
         // TH1300ZB and TH1400ZB specific
         key: ['floor_min_heat_setpoint'],
         convertSet: async (entity, key, value, meta) => {
-            // @ts-expect-error
+            // @ts-expect-error ignore
             if ((value >= 5 && value <= 34) || value == 'off') {
-                // @ts-expect-error
+                // @ts-expect-error ignore
                 await entity.write('manuSpecificSinope', { floorMinHeatSetpointLimit: value == 'off' ? -32768 : value * 100 });
                 return { readAfterWriteTime: 250, state: { floor_min_heat_setpoint: value } };
             }
@@ -441,9 +441,9 @@ const tzLocal = {
         // TH1300ZB and TH1400ZB specific
         key: ['floor_max_heat_setpoint'],
         convertSet: async (entity, key, value, meta) => {
-            // @ts-expect-error
+            // @ts-expect-error ignore
             if ((value >= 7 && value <= 36) || value == 'off') {
-                // @ts-expect-error
+                // @ts-expect-error ignore
                 await entity.write('manuSpecificSinope', { floorMaxHeatSetpointLimit: value == 'off' ? -32768 : value * 100 });
                 return { readAfterWriteTime: 250, state: { floor_max_heat_setpoint: value } };
             }
@@ -461,8 +461,8 @@ const tzLocal = {
             }
             const lookup = { '10k': 0, '12k': 1 };
             value = value.toLowerCase();
-            // @ts-expect-error
-            if (lookup.hasOwnProperty(value)) {
+            // @ts-expect-error ignore
+            if (lookup[value] !== undefined) {
                 await entity.write('manuSpecificSinope', { temperatureSensor: utils.getFromLookup(value, lookup) });
             }
             return { readAfterWriteTime: 250, state: { floor_temperature_sensor: value } };
@@ -474,16 +474,8 @@ const tzLocal = {
     time_format: {
         key: ['time_format'],
         convertSet: async (entity, key, value, meta) => {
-            if (typeof value !== 'string') {
-                return;
-            }
-            const lookup = { '24h': 0, '12h': 1 };
-            value = value.toLowerCase();
-            utils.assertString(value);
-            if (lookup.hasOwnProperty(value)) {
-                await entity.write('manuSpecificSinope', { timeFormatToDisplay: utils.getFromLookup(value, lookup) }, manuSinope);
-                return { readAfterWriteTime: 250, state: { time_format: value } };
-            }
+            await entity.write('manuSpecificSinope', { timeFormatToDisplay: utils.getFromLookup(value, { '24h': 0, '12h': 1 }) }, manuSinope);
+            return { readAfterWriteTime: 250, state: { time_format: value } };
         },
         convertGet: async (entity, key, meta) => {
             await entity.read('manuSpecificSinope', ['timeFormatToDisplay'], manuSinope);
@@ -736,7 +728,7 @@ const definitions = [
             try {
                 await reporting.thermostatSystemMode(endpoint);
             }
-            catch (error) {
+            catch {
                 /* Not all support this */
             }
             await reporting.readMeteringMultiplierDivisor(endpoint);
@@ -746,7 +738,7 @@ const definitions = [
                 await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
                 await reporting.activePower(endpoint, { min: 10, max: 305, change: 1 }); // divider 1: 1W
             }
-            catch (error) {
+            catch {
                 endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', { acPowerMultiplier: 1, acPowerDivisor: 1 });
             }
             await reporting.rmsCurrent(endpoint, { min: 10, max: 306, change: 100 }); // divider 1000: 0.1Arms
@@ -858,7 +850,7 @@ const definitions = [
             try {
                 await reporting.thermostatSystemMode(endpoint);
             }
-            catch (error) {
+            catch {
                 /* Not all support this */
             }
             await reporting.readMeteringMultiplierDivisor(endpoint);
@@ -868,7 +860,7 @@ const definitions = [
                 await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
                 await reporting.activePower(endpoint, { min: 10, max: 305, change: 1 }); // divider 1: 1W
             }
-            catch (error) {
+            catch {
                 endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', { acPowerMultiplier: 1, acPowerDivisor: 1 });
             }
             await reporting.rmsCurrent(endpoint, { min: 10, max: 306, change: 100 }); // divider 1000: 0.1Arms
@@ -995,7 +987,7 @@ const definitions = [
             try {
                 await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
             }
-            catch (error) {
+            catch {
                 /* Do nothing */
             }
         },
@@ -1120,7 +1112,7 @@ const definitions = [
             try {
                 await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
             }
-            catch (error) {
+            catch {
                 /* Do nothing */
             }
         },
@@ -1227,40 +1219,40 @@ const definitions = [
             try {
                 await reporting.readMeteringMultiplierDivisor(endpoint);
             }
-            catch (error) {
+            catch {
                 /* Do nothing*/
             }
             try {
                 await reporting.currentSummDelivered(endpoint, { min: 10, max: 303, change: [1, 1] });
             }
-            catch (error) {
+            catch {
                 /* Do nothing*/
             }
             try {
                 await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
                 await reporting.activePower(endpoint, { min: 10, max: 305, change: 1 }); // divider 1: 1W
             }
-            catch (error) {
+            catch {
                 endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', { acPowerMultiplier: 1, acPowerDivisor: 1 });
             }
             try {
                 await endpoint.read('haElectricalMeasurement', ['acCurrentMultiplier', 'acCurrentDivisor']);
                 await reporting.rmsCurrent(endpoint, { min: 10, max: 306, change: 100 }); // divider 1000: 0.1Arms
             }
-            catch (error) {
+            catch {
                 /* Do nothing*/
             }
             try {
                 await endpoint.read('haElectricalMeasurement', ['acVoltageMultiplier', 'acVoltageDivisor']);
                 await reporting.rmsVoltage(endpoint, { min: 10, max: 307, change: 5 }); // divider 10: 0.5Vrms
             }
-            catch (error) {
+            catch {
                 /* Do nothing*/
             }
             try {
                 await reporting.thermostatKeypadLockMode(endpoint);
             }
-            catch (error) {
+            catch {
                 // Not all support this: https://github.com/Koenkk/zigbee2mqtt/issues/3760
             }
             await endpoint.configureReporting('manuSpecificSinope', [
@@ -1418,7 +1410,7 @@ const definitions = [
             try {
                 await reporting.thermostatSystemMode(endpoint);
             }
-            catch (error) {
+            catch {
                 /* Not all support this */
             }
             await endpoint.read('hvacThermostat', [
@@ -1589,7 +1581,7 @@ const definitions = [
                 await reporting.readMeteringMultiplierDivisor(endpoint);
                 await reporting.currentSummDelivered(endpoint, { min: 10, max: 300, change: [0, 10] });
             }
-            catch (error) {
+            catch {
                 /* Do nothing*/
             }
             const payload = [
@@ -1870,13 +1862,13 @@ const definitions = [
             try {
                 await reporting.batteryVoltage(endpoint);
             }
-            catch (error) {
+            catch {
                 /* Do Nothing */
             }
             try {
                 await reporting.batteryAlarmState(endpoint);
             }
-            catch (error) {
+            catch {
                 /* Do Nothing */
             }
         },