zigbee-herdsman-converters 14.0.391 → 14.0.392

package/converters/fromZigbee.js

@@ -2498,6 +2498,29 @@ const converters = {
             }
         },
     },
+    neo_alarm: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataReport', 'commandDataResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const dp = msg.data.dp;
+            const value = tuya.getDataValue(msg.data.datatype, msg.data.data);
+
+            switch (dp) {
+            case tuya.dataPoints.neoAOAlarm: // 0x13 [TRUE,FALSE]
+                return {alarm: value};
+            case tuya.dataPoints.neoAODuration: // 0x7 [0,0,0,10] duration alarm in second
+                return {duration: value};
+            case tuya.dataPoints.neoAOBattPerc: // 0x15 [0,0,0,100] battery percentage
+                return {battpercentage: value};
+            case tuya.dataPoints.neoAOMelody: // 0x21 [5] Melody
+                return {melody: value};
+            case tuya.dataPoints.neoAOVolume: // 0x5 [0]/[1]/[2] Volume 0-max, 2-low
+                return {volume: {2: 'low', 1: 'medium', 0: 'high'}[value]};
+            default: // Unknown code
+                meta.logger.warn(`Unhandled DP #${dp}: ${JSON.stringify(msg.data)}`);
+            }
+        },
+    },
     terncy_contact: {
         cluster: 'genBinaryInput',
         type: 'attributeReport',
@@ -5268,6 +5291,7 @@ const converters = {
                     payload.gas_sensitivity = {1: '15%LEL', 2: '10%LEL'}[msg.data['268']];
                 }
             }
+            if (msg.data.hasOwnProperty('293')) payload.click_mode = {1: 'fast', 2: 'multi'}[msg.data['293']];
             if (msg.data.hasOwnProperty('294')) payload.mute = msg.data['294'] === 1; // JT-BZ-01AQ/A
             if (msg.data.hasOwnProperty('295')) payload.test = msg.data['295'] === 1; // JT-BZ-01AQ/A
             if (msg.data.hasOwnProperty('313')) payload.state = msg.data['313'] === 1 ? 'preparation' : 'work'; // JT-BZ-01AQ/A
@@ -7694,7 +7718,7 @@ const converters = {
                 result = {tumble_switch: {false: 'OFF', true: 'ON'}[value]};
                 break;
             case tuya.dataPoints.trsfFallDownStatus:
-                result = {fall_down_status: {0: false, 1: true}[value]};
+                result = {fall_down_status: tuya.tuyaRadar.fallDown[value]};
                 break;
             case tuya.dataPoints.trsfStaticDwellAlarm:
                 result = {static_dwell_alarm: value};

package/converters/toZigbee.js

@@ -5074,6 +5074,32 @@ const converters = {
             }
         },
     },
+    neo_alarm: {
+        key: [
+            'alarm', 'melody', 'volume', 'duration',
+        ],
+        convertSet: async (entity, key, value, meta) => {
+            switch (key) {
+            case 'alarm':
+                await tuya.sendDataPointBool(entity, tuya.dataPoints.neoAOAlarm, value);
+                break;
+            case 'melody':
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.neoAOMelody, parseInt(value, 10));
+                break;
+            case 'volume':
+                await tuya.sendDataPointEnum(
+                    entity,
+                    tuya.dataPoints.neoAOVolume,
+                    {'low': 2, 'medium': 1, 'high': 0}[value]);
+                break;
+            case 'duration':
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.neoAODuration, value);
+                break;
+            default: // Unknown key
+                throw new Error(`Unhandled key ${key}`);
+            }
+        },
+    },
     nous_lcd_temperature_humidity_sensor: {
         key: ['min_temperature', 'max_temperature', 'temperature_sensitivity', 'temperature_unit_convert'],
         convertSet: async (entity, key, value, meta) => {
@@ -6548,6 +6574,9 @@ const converters = {
             await entity.write('aqaraOpple', {0x0125: {value: lookupState[value], type: 0x20}}, manufacturerOptions.xiaomi);
             return {state: {click_mode: value}};
         },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('aqaraOpple', [0x125], manufacturerOptions.xiaomi);
+        },
     },
     tuya_light_wz5: {
         key: ['color', 'color_temp', 'brightness', 'white_brightness'],

package/devices/lg.js

@@ -0,0 +1,18 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['B1027EB0Z01'],
+        model: 'B1027EB0Z01',
+        vendor: 'LG Electronics',
+        description: 'Smart bulb 1',
+        extend: extend.light_onoff_brightness(),
+    },
+    {
+        zigbeeModel: ['B1027EB0Z02'],
+        model: 'B1027EB0Z02',
+        vendor: 'LG Electronics',
+        description: 'Smart bulb 2',
+        extend: extend.light_onoff_brightness(),
+    },
+];

package/devices/neo.js

@@ -34,6 +34,29 @@ module.exports = [
             await endpoint.command('manuSpecificTuya', 'mcuVersionRequest', {'seq': 0x0002});
         },
     },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_t1blo2bj'}],
+        zigbeeModel: ['1blo2bj'],
+        model: 'NAS-AB02B2',
+        vendor: 'Neo',
+        description: 'Alarm',
+        fromZigbee: [fz.neo_alarm, fz.ignore_basic_report],
+        toZigbee: [tz.neo_alarm],
+        exposes: [
+            e.battery_low(),
+            exposes.binary('alarm', ea.STATE_SET, true, false),
+            exposes.enum('melody', ea.STATE_SET, Array.from(Array(18).keys()).map((x)=>(x+1).toString())),
+            exposes.numeric('duration', ea.STATE_SET).withUnit('second').withValueMin(0).withValueMax(1800),
+            exposes.enum('volume', ea.STATE_SET, ['low', 'medium', 'high']),
+            exposes.numeric('battpercentage', ea.STATE).withUnit('%'),
+        ],
+        onEvent: tuya.onEventSetLocalTime,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.command('manuSpecificTuya', 'dataQuery', {});
+            await endpoint.command('manuSpecificTuya', 'mcuVersionRequest', {'seq': 0x0002});
+        },
+    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_7hfcudw5'}],
         model: 'NAS-PD07',

package/devices/philips.js

@@ -66,7 +66,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['915005996401'],
+        zigbeeModel: ['915005996401', '915005996501'],
         model: '915005996401',
         vendor: 'Philips',
         description: 'Hue white ambiance ceiling light Enrave S with Bluetooth',
@@ -494,6 +494,15 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['1746630V7'],
+        model: '1746630V7',
+        vendor: 'Philips',
+        description: 'Amarant linear outdoor light',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['LCC001'],
         model: '4090531P7',
@@ -2627,4 +2636,13 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['929003045001_01', '929003045001_02', '929003045001_03'],
+        model: '9290019533',
+        vendor: 'Philips',
+        description: 'Hue white ambiance GU10 with Bluetooth',
+        meta: {turnsOffAtBrightness1: true},
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        ota: ota.zigbeeOTA,
+    },
 ];

package/devices/sercomm.js

@@ -37,6 +37,22 @@ module.exports = [
             endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 1000000, multiplier: 1});
         },
     },
+    {
+        zigbeeModel: ['SZ-ESW02'],
+        model: 'SZ-ESW02',
+        vendor: 'Sercomm',
+        description: 'Telstra smart plug 2',
+        fromZigbee: [fz.on_off, fz.metering],
+        exposes: [e.switch(), e.power()],
+        toZigbee: [tz.on_off],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
+            await reporting.onOff(endpoint);
+            await reporting.instantaneousDemand(endpoint);
+            endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 1000000, multiplier: 1});
+        },
+    },
     {
         zigbeeModel: ['XHS2-SE'],
         model: 'XHS2-SE',

package/devices/tuya.js

@@ -839,6 +839,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_sbordckq'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_fctwhugx'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_zah67ekd'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_hsgrhjpf'},
             // Window pushers:
             {modelID: 'TS0601', manufacturerName: '_TZE200_g5wdnuow'},
             // Tubular motors:
@@ -1755,7 +1756,8 @@ module.exports = [
                 .withDescription('fall sensitivity of the radar'),
             exposes.numeric('tumble_alarm_time', ea.STATE_SET).withValueMin(1).withValueMax(5).withValueStep(1)
                 .withUnit('min').withDescription('tumble alarm time'),
-            exposes.binary('fall_down_status', ea.STATE).withDescription('fall down status'),
+            exposes.enum('fall_down_status', ea.STATE, Object.values(tuya.tuyaRadar.fallDown))
+                .withDescription('fall down status'),
             exposes.text('static_dwell_alarm', ea.STATE).withDescription('static dwell alarm'),
         ],
         configure: async (device, coordinatorEndpoint, logger) => {

package/devices/xiaomi.js

@@ -1837,7 +1837,7 @@ module.exports = [
         fromZigbee: [fz.xiaomi_multistate_action, fz.aqara_opple],
         toZigbee: [tz.xiaomi_switch_click_mode],
         exposes: [e.battery(), e.battery_voltage(), e.action(['single', 'double', 'hold']),
-            exposes.enum('click_mode', ea.SET, ['fast', 'multi'])
+            exposes.enum('click_mode', ea.ALL, ['fast', 'multi'])
                 .withDescription('Click mode, fast: only supports single click which will be send immediately after clicking.' +
                     'multi: supports more events like double and hold')],
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -1853,7 +1853,7 @@ module.exports = [
         exposes: [e.battery(), e.battery_voltage(),
             e.action(['single_left', 'single_right', 'single_both', 'double_left', 'double_right', 'hold_left', 'hold_right']),
             // eslint-disable-next-line max-len
-            exposes.enum('click_mode', ea.SET, ['fast', 'multi']).withDescription('Click mode, fast: only supports single click which will be send immediately after clicking, multi: supports more events like double and hold'),
+            exposes.enum('click_mode', ea.ALL, ['fast', 'multi']).withDescription('Click mode, fast: only supports single click which will be send immediately after clicking, multi: supports more events like double and hold'),
         ],
         fromZigbee: [fz.xiaomi_multistate_action, fz.aqara_opple],
         toZigbee: [tz.xiaomi_switch_click_mode],
@@ -1864,4 +1864,23 @@ module.exports = [
             await endpoint1.write('aqaraOpple', {0x0125: {value: 0x02, type: 0x20}}, {manufacturerCode: 0x115f});
         },
     },
+    {
+        zigbeeModel: ['lumi.remote.b18ac1'],
+        model: 'WXKG14LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara wireless remote switch H1 (single rocker)',
+        fromZigbee: [fz.xiaomi_multistate_action, fz.aqara_opple],
+        toZigbee: [tz.xiaomi_switch_click_mode, tz.aqara_opple_operation_mode],
+        exposes: [e.battery(), e.battery_voltage(), e.action(['single', 'double', 'triple', 'hold']),
+            exposes.enum('click_mode', ea.ALL, ['fast', 'multi'])
+                .withDescription('Click mode, fast: only supports single click which will be send immediately after clicking.' +
+                    'multi: supports more events like double and hold'),
+            exposes.enum('operation_mode', ea.ALL, ['command', 'event'])
+                .withDescription('Operation mode, select "command" to enable bindings (wake up the device before changing modes!)')],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint1 = device.getEndpoint(1);
+            await endpoint1.write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
+            await endpoint1.read('aqaraOpple', [0x0125], {manufacturerCode: 0x115f});
+        },
+    },
 ];

package/lib/tuya.js

@@ -314,6 +314,12 @@ const dataPoints = {
     neoHumidityAlarm: 114,
     neoUnknown3: 115,
     neoVolume: 116,
+    // Neo AlarmOnly
+    neoAOBattPerc: 15,
+    neoAOMelody: 21,
+    neoAODuration: 7,
+    neoAOAlarm: 13,
+    neoAOVolume: 5,
     // Saswell TRV
     saswellHeating: 3,
     saswellWindowDetection: 8,
@@ -644,6 +650,11 @@ const tuyaRadar = {
         1: 'moving_forward',
         2: 'moving_backward',
     },
+    fallDown: {
+        0: 'none',
+        1: 'maybe_fall',
+        2: 'fall',
+    },
 };
 
 // Motion sensor lookups

package/npm-shrinkwrap.json

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

package/package.json

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