zigbee-herdsman-converters 14.0.283 → 14.0.287

package/converters/fromZigbee.js

@@ -4132,6 +4132,8 @@ const converters = {
                 return {battery_low: value === 0};
             case tuya.dataPoints.state:
                 return {smoke: value === 0};
+            case tuya.dataPoints.wooxSmokeTest:
+                return {smoke: value};
             default:
                 meta.logger.warn(`zigbee-herdsman-converters:tuya_smoke: Unrecognized DP #${ dp} with data ${JSON.stringify(msg.data)}`);
             }
@@ -6738,6 +6740,70 @@ const converters = {
             }
         },
     },
+    moes_thermostat_tv: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandGetData', 'commandSetDataResponse', 'raw'],
+        convert: (model, msg, publish, options, meta) => {
+            const dp = msg.data.dp;
+            let value = tuya.getDataValue(msg.data.datatype, msg.data.data);
+            let result = null;
+            switch (dp) {
+            case tuya.dataPoints.tvMode:
+                result = {system_mode: tuya.tvThermostatMode[value]};
+                break;
+            case tuya.dataPoints.tvWindowDetection:
+                result = {window_detection: {1: false, 0: true}[value]};
+                break;
+            case tuya.dataPoints.tvFrostDetection:
+                result = {frost_detection: {1: false, 0: true}[value]};
+                break;
+            case tuya.dataPoints.tvHeatingSetpoint:
+                result = {current_heating_setpoint: (value / 10).toFixed(1)};
+                break;
+            case tuya.dataPoints.tvLocalTemp:
+                result = {local_temperature: (value / 10).toFixed(1)};
+                break;
+            case tuya.dataPoints.tvTempCalibration:
+                value = value > 0x7FFFFFFF ? 0xFFFFFFFF - value : value;
+                result = {local_temperature_calibration: (value / 10).toFixed(1)};
+                break;
+            case tuya.dataPoints.tvHolidayTemp:
+                result = {holiday_temperature: (value / 10).toFixed(1)};
+                break;
+            case tuya.dataPoints.tvBattery:
+                result = {battery: value};
+                break;
+            case tuya.dataPoints.tvChildLock:
+                result = {child_lock: {1: 'LOCK', 0: 'UNLOCK'}[value]};
+                break;
+            case tuya.dataPoints.tvErrorStatus:
+                result = {error: value};
+                break;
+            case tuya.dataPoints.tvHolidayMode:
+                result = {holiday_mode: value};
+                break;
+            // case tuya.dataPoints.tvBoostMode:
+            //     result = {boost_mode: {1: false, 0: true}[value]};
+            //     break;
+            case tuya.dataPoints.tvBoostTime:
+                result = {boost_heating_countdown: value};
+                break;
+            case tuya.dataPoints.tvOpenWindowTemp:
+                result = {open_window_temperature: (value / 10).toFixed(1)};
+                break;
+            case tuya.dataPoints.tvComfortTemp:
+                result = {comfort_temperature: (value / 10).toFixed(1)};
+                break;
+            case tuya.dataPoints.tvEcoTemp:
+                result = {eco_temperature: (value / 10).toFixed(1)};
+                break;
+            default:
+                meta.logger.warn(`fromZigbee.moes_thermostat_tv: NOT RECOGNIZED DP ${dp} with data ${JSON.stringify(msg.data)}`);
+            }
+
+            return result;
+        },
+    },
     sihas_people_cnt: {
         cluster: 'genAnalogInput',
         type: ['attributeReport', 'readResponse'],

package/converters/toZigbee.js

@@ -1912,7 +1912,7 @@ const converters = {
         key: ['power_outage_memory'],
         convertSet: async (entity, key, value, meta) => {
             if (['ZNCZ04LM', 'QBKG25LM', 'SSM-U01', 'SSM-U02', 'DLKZMK11LM', 'QBKG39LM', 'QBKG41LM', 'ZNCZ15LM',
-                'WS-EUK01', 'WS-EUK02', 'WS-EUK03', 'WS-EUK04', 'QBKG31LM', 'QBCZ15LM', 'QBKG20LM',
+                'WS-EUK01', 'WS-EUK02', 'WS-EUK03', 'WS-EUK04', 'QBKG31LM', 'QBCZ15LM', 'QBKG20LM', 'QBKG38LM',
                 'QBCZ14LM'].includes(meta.mapped.model)) {
                 await entity.write('aqaraOpple', {0x0201: {value: value ? 1 : 0, type: 0x10}}, manufacturerOptions.xiaomi);
             } else if (['ZNCZ02LM', 'QBCZ11LM'].includes(meta.mapped.model)) {
@@ -1935,7 +1935,8 @@ const converters = {
         },
         convertGet: async (entity, key, meta) => {
             if (['ZNCZ04LM', 'QBKG25LM', 'SSM-U01', 'SSM-U02', 'DLKZMK11LM', 'QBKG39LM', 'QBKG41LM', 'ZNCZ15LM',
-                'WS-EUK02', 'WS-EUK01', 'QBKG31LM', 'QBCZ15LM', 'QBCZ14LM', 'QBKG20LM'].includes(meta.mapped.model)) {
+                'WS-EUK02', 'WS-EUK01', 'QBKG31LM', 'QBCZ15LM', 'QBCZ14LM', 'QBKG20LM',
+                'QBKG38LM'].includes(meta.mapped.model)) {
                 await entity.read('aqaraOpple', [0x0201]);
             } else if (['ZNCZ02LM', 'QBCZ11LM', 'ZNCZ11LM'].includes(meta.mapped.model)) {
                 await entity.read('aqaraOpple', [0xFFF0]);
@@ -5836,6 +5837,61 @@ const converters = {
             }
         },
     },
+    moes_thermostat_tv: {
+        key: [
+            'system_mode', 'window_detection', 'frost_detection', 'child_lock',
+            'current_heating_setpoint', 'local_temperature_calibration',
+            'holiday_temperature', 'comfort_temperature', 'eco_temperature', 'boost_mode', 'open_window_temperature',
+        ],
+        convertSet: async (entity, key, value, meta) => {
+            switch (key) {
+            case 'system_mode':
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.tvMode, utils.getKey(tuya.tvThermostatMode, value));
+                break;
+            case 'window_detection':
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.tvWindowDetection, (value) ? 0 : 1);
+                break;
+            case 'frost_detection':
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.tvFrostDetection, (value) ? 0 : 1);
+                break;
+            case 'child_lock':
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.tvChildLock, {'unlock': 0, 'lock': 1}[value.toLowerCase()]);
+                break;
+            case 'local_temperature_calibration':
+                value = Math.round(value * 10);
+                value = (value < 0) ? 0xFFFFFFFF + value + 1 : value;
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.tvTempCalibration, value);
+                break;
+            case 'current_heating_setpoint':
+                value = Math.round(value * 10);
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.tvHeatingSetpoint, value);
+                break;
+            case 'holiday_temperature':
+                value = Math.round(value * 10);
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.tvHolidayTemp, value);
+                break;
+            case 'comfort_temperature':
+                value = Math.round(value * 10);
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.tvComfortTemp, value);
+                break;
+            case 'eco_temperature':
+                value = Math.round(value * 10);
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.tvEcoTemp, value);
+                break;
+            // case 'boost_mode':
+            //     // set 300sec boost time
+            //     await tuya.sendDataPointValue(entity, tuya.dataPoints.tvBoostTime, 300);
+            //     await tuya.sendDataPointEnum(entity, tuya.dataPoints.tvBoostMode, (value) ? 0 : 1);
+            //     break;
+            case 'open_window_temperature':
+                value = Math.round(value * 10);
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.tvOpenWindowTemp, value);
+                break;
+            default: // Unknown key
+                meta.logger.warn(`toZigbee.moes_thermostat_tv: Unhandled key ${key}`);
+            }
+        },
+    },
     sihas_set_people: {
         key: ['people'],
         convertSet: async (entity, key, value, meta) => {

package/devices/moes.js

@@ -287,4 +287,27 @@ module.exports = [
         exposes: [e.cover_position(), exposes.numeric('calibration_time', ea.ALL), exposes.enum('moving', ea.STATE, ['UP', 'STOP', 'DOWN']),
             exposes.binary('motor_reversal', ea.ALL, 'ON', 'OFF')],
     },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_e9ba97vf'}],
+        model: 'TV01-ZB',
+        vendor: 'Moes',
+        description: 'Thermostat radiator valve',
+        fromZigbee: [fz.moes_thermostat_tv, fz.ignore_tuya_set_time],
+        toZigbee: [tz.moes_thermostat_tv],
+        exposes: [
+            e.battery(), e.child_lock(), e.window_detection(),
+            exposes.binary('frost_detection', ea.STATE_SET, true, false).withDescription('Enables/disables frost detection on the device'),
+            exposes.numeric('holiday_temperature', ea.STATE_SET).withDescription('Holiday mode temperature'),
+            exposes.numeric('comfort_temperature', ea.STATE_SET).withDescription('Comfort mode temperature'),
+            exposes.numeric('eco_temperature', ea.STATE_SET).withDescription('Eco mode temperature'),
+            exposes.numeric('open_window_temperature', ea.STATE_SET).withDescription('Open window mode temperature'),
+            exposes.numeric('boost_heating_countdown', ea.STATE).withDescription('Boost heating countdown'),
+            exposes.numeric('error_status', ea.STATE).withDescription('Error status'),
+            // exposes.binary('boost_mode', ea.STATE_SET).withDescription('Enables/disables boost mode'),
+            exposes.climate().withSetpoint('current_heating_setpoint', 5, 30, 1, ea.STATE_SET)
+                .withLocalTemperature(ea.STATE).withLocalTemperatureCalibration(ea.STATE_SET),
+            exposes.enum('system_mode', ea.STATE_SET, Object.values(tuya.tvThermostatMode)).withDescription('Mode of this device'),
+        ],
+        onEvent: tuya.onEventSetLocalTime,
+    },
 ];

package/devices/perenio.js

@@ -0,0 +1,21 @@
+const fz = require('zigbee-herdsman-converters/converters/fromZigbee');
+const exposes = require('zigbee-herdsman-converters/lib/exposes');
+const reporting = require('zigbee-herdsman-converters/lib/reporting');
+const e = exposes.presets;
+
+module.exports = [
+    {
+        zigbeeModel: ['PECLS01'],
+        model: 'PECLS01',
+        vendor: 'Perenio',
+        description: 'Flood alarm device',
+        fromZigbee: [fz.ias_water_leak_alarm_1, fz.ignore_basic_report, fz.battery],
+        toZigbee: [],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
+        },
+        exposes: [e.water_leak(), e.battery_low(), e.tamper(), e.battery()],
+    },
+];

package/devices/philips.js

@@ -47,6 +47,15 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['929002376301'],
+        model: '929002376301',
+        vendor: 'Philips',
+        description: 'Hue Iris rose limited edition (generation 4) ',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['5063130P7'],
         model: '5063130P7',
@@ -543,7 +552,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue white ambiance E27 1100lm with Bluetooth',
         meta: {turnsOffAtBrightness1: true},
-        extend: hueExtend.light_onoff_brightness_colortemp(),
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -663,6 +672,15 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color(),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['LCA008'],
+        model: '929002471601',
+        vendor: 'Philips',
+        description: 'Hue white and color ambiance E26/E27 1600lm',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['LCT001', 'LCT007', 'LCT010', 'LCT012', 'LCT014', 'LCT015', 'LCT016', 'LCT021'],
         model: '9290012573A',

package/devices/xiaomi.js

@@ -694,7 +694,7 @@ module.exports = [
         vendor: 'Xiaomi',
         description: 'Aqara smart wall switch T1 (with neutral, double rocker)',
         fromZigbee: [fz.on_off, fz.xiaomi_power, fz.xiaomi_multistate_action, fz.xiaomi_switch_opple_basic],
-        toZigbee: [tz.on_off, tz.xiaomi_power, tz.xiaomi_switch_operation_mode_opple, tz.xiaomi_switch_power_outage_memory,
+        toZigbee: [tz.on_off, tz.xiaomi_switch_operation_mode_opple, tz.xiaomi_switch_power_outage_memory,
             tz.xiaomi_led_disabled_night],
         meta: {multiEndpoint: true},
         endpoint: (device) => {
@@ -702,7 +702,7 @@ module.exports = [
         },
         exposes: [
             e.switch().withEndpoint('left'), e.switch().withEndpoint('right'),
-            e.power().withAccess(ea.STATE_GET), e.energy(), e.voltage().withAccess(ea.STATE),
+            e.power().withAccess(ea.STATE), e.energy(), e.voltage().withAccess(ea.STATE),
             e.power_outage_memory(), e.led_disabled_night(), e.temperature().withAccess(ea.STATE),
             e.action([
                 'single_left', 'double_left', 'single_right', 'double_right', 'single_both', 'double_both']),
@@ -1472,10 +1472,7 @@ module.exports = [
                     'Quick mode makes the device respond faster.')],
         onEvent: preventReset,
         configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint1 = device.getEndpoint(1);
-            // set "event" mode
-            await endpoint1.write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f,
-                disableDefaultResponse: true, disableResponse: true});
+            await device.getEndpoint(1).write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
         },
     },
     {
@@ -1506,10 +1503,7 @@ module.exports = [
         ],
         onEvent: preventReset,
         configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint1 = device.getEndpoint(1);
-            // set "event" mode
-            await endpoint1.write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f,
-                disableDefaultResponse: true, disableResponse: true});
+            await device.getEndpoint(1).write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
         },
     },
     {

package/lib/tuya.js

@@ -356,6 +356,7 @@ const dataPoints = {
     // Woox
     wooxSwitch: 102,
     wooxBattery: 14,
+    wooxSmokeTest: 8,
     // FrankEver
     frankEverTimer: 9,
     frankEverTreshold: 101,
@@ -395,6 +396,33 @@ const dataPoints = {
     msLightOffLuminancePrefer: 108,
     msLuminanceLevel: 109,
     msLedStatus: 110,
+    // TV01 Moes Thermostat
+    tvMode: 2,
+    tvWindowDetection: 8,
+    tvFrostDetection: 10,
+    tvHeatingSetpoint: 16,
+    tvLocalTemp: 24,
+    tvTempCalibration: 27,
+    tvWorkingDay: 31,
+    tvHolidayTemp: 32,
+    tvBattery: 35,
+    tvChildLock: 40,
+    tvErrorStatus: 45,
+    tvHolidayMode: 46,
+    tvBoostTime: 101,
+    tvOpenWindowTemp: 102,
+    tvComfortTemp: 104,
+    tvEcoTemp: 105,
+    tvWeekSchedule: 106,
+    tvHeatingStop: 107,
+    tvMondaySchedule: 108,
+    tvWednesdaySchedule: 109,
+    tvFridaySchedule: 110,
+    tvSundaySchedule: 111,
+    tvTuesdaySchedule: 112,
+    tvThursdaySchedule: 113,
+    tvSaturdaySchedule: 114,
+    tvBoostMode: 115,
 };
 
 const thermostatWeekFormat = {
@@ -478,6 +506,12 @@ const msLookups = {
     },
 };
 
+const tvThermostatMode = {
+    0: 'auto',
+    1: 'manual',
+    3: 'holiday',
+};
+
 async function sendDataPoint(entity, datatype, dp, data, cmd, transid) {
     if (transid === undefined) {
         if (sendDataPoint.transId === undefined) {
@@ -590,4 +624,5 @@ module.exports = {
     silvercrestEffects,
     fanModes,
     msLookups,
+    tvThermostatMode,
 };

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.283",
+  "version": "14.0.287",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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