From 31cfa66f7091b59806e27827b5c86354b98ec700 Mon Sep 17 00:00:00 2001 From: zxf Date: Fri, 9 Jun 2023 00:39:41 +0800 Subject: [PATCH 1/2] add support for h1m(anqbkg24lm) --- src/converters/toZigbee.js | 8 ++++---- src/devices/xiaomi.ts | 23 +++++++++++++++++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/converters/toZigbee.js b/src/converters/toZigbee.js index b7e9c5a0f09e2..eff2cb44308dc 100644 --- a/src/converters/toZigbee.js +++ b/src/converters/toZigbee.js @@ -2285,7 +2285,7 @@ const converters = { if (['SP-EUC01', 'ZNCZ04LM', 'ZNCZ12LM', 'ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM', 'SSM-U01', 'SSM-U02', 'DLKZMK11LM', 'DLKZMK12LM', 'WS-EUK01', 'WS-EUK02', 'WS-EUK03', 'WS-EUK04', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM', 'QBKG28LM', 'QBKG29LM', 'QBKG31LM', 'QBKG34LM', 'QBKG38LM', 'QBKG39LM', 'QBKG40LM', 'QBKG41LM', 'ZNDDMK11LM', 'ZNLDP13LM', 'ZNQBKG31LM', - 'WS-USC02', 'WS-USC03', 'WS-USC04', + 'WS-USC02', 'WS-USC03', 'WS-USC04', 'ZNQBKG24LM', ].includes(meta.mapped.model)) { await entity.write('aqaraOpple', {0x0201: {value: value ? 1 : 0, type: 0x10}}, manufacturerOptions.xiaomi); } else if (['ZNCZ02LM', 'QBCZ11LM', 'LLKZMK11LM'].includes(meta.mapped.model)) { @@ -2310,7 +2310,7 @@ const converters = { if (['SP-EUC01', 'ZNCZ04LM', 'ZNCZ12LM', 'ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM', 'SSM-U01', 'SSM-U02', 'DLKZMK11LM', 'DLKZMK12LM', 'WS-EUK01', 'WS-EUK02', 'WS-EUK03', 'WS-EUK04', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM', 'QBKG28LM', 'QBKG29LM', 'QBKG31LM', 'QBKG34LM', 'QBKG38LM', 'QBKG39LM', 'QBKG40LM', 'QBKG41LM', 'ZNDDMK11LM', 'ZNLDP13LM', 'ZNQBKG31LM', - 'WS-USC02', 'WS-USC03', 'WS-USC04', + 'WS-USC02', 'WS-USC03', 'WS-USC04', 'ZNQBKG24LM', ].includes(meta.mapped.model)) { await entity.read('aqaraOpple', [0x0201]); } else if (['ZNCZ02LM', 'QBCZ11LM', 'ZNCZ11LM'].includes(meta.mapped.model)) { @@ -2429,7 +2429,7 @@ const converters = { convertSet: async (entity, key, value, meta) => { if (['ZNCZ04LM', 'ZNCZ12LM', 'ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM', 'QBKG28LM', 'QBKG29LM', 'QBKG31LM', 'QBKG34LM', 'DLKZMK11LM', 'SSM-U01', 'WS-EUK01', 'WS-EUK02', - 'WS-EUK03', 'WS-EUK04', 'SP-EUC01'].includes(meta.mapped.model)) { + 'WS-EUK03', 'WS-EUK04', 'SP-EUC01', 'ZNQBKG24LM'].includes(meta.mapped.model)) { await entity.write('aqaraOpple', {0x0203: {value: value ? 1 : 0, type: 0x10}}, manufacturerOptions.xiaomi); } else if (['ZNCZ11LM'].includes(meta.mapped.model)) { const payload = value ? @@ -2445,7 +2445,7 @@ const converters = { convertGet: async (entity, key, meta) => { if (['ZNCZ04LM', 'ZNCZ12LM', 'ZNCZ15LM', 'QBCZ15LM', 'QBCZ14LM', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM', 'QBKG28LM', 'QBKG29LM', 'QBKG31LM', 'QBKG34LM', 'DLKZMK11LM', 'SSM-U01', 'WS-EUK01', 'WS-EUK02', - 'WS-EUK03', 'WS-EUK04', 'SP-EUC01'].includes(meta.mapped.model)) { + 'WS-EUK03', 'WS-EUK04', 'SP-EUC01', 'ZNQBKG24LM'].includes(meta.mapped.model)) { await entity.read('aqaraOpple', [0x0203], manufacturerOptions.xiaomi); } else { throw new Error('Not supported'); diff --git a/src/devices/xiaomi.ts b/src/devices/xiaomi.ts index f1f84071c3c1e..0d233291fc176 100644 --- a/src/devices/xiaomi.ts +++ b/src/devices/xiaomi.ts @@ -3283,14 +3283,33 @@ const definitions: Definition[] = [ }, ota: ota.zigbeeOTA, }, + { + zigbeeModel: ['lumi.switch.acn029'], + model: 'ZNQBKG24LM', + vendor: 'Xiaomi', + description: 'Aqara smart wall switch H1M (with neutral, single rocker)', + fromZigbee: [fz.on_off, fz.xiaomi_power, fz.xiaomi_multistate_action, fz.aqara_opple], + toZigbee: [ + tz.on_off, tz.xiaomi_switch_operation_mode_opple, tz.xiaomi_switch_power_outage_memory, + tz.xiaomi_led_disabled_night, tz.xiaomi_flip_indicator_light, + ], + exposes: [ + e.switch(), e.power(), e.energy(), e.voltage(), e.device_temperature(), + e.action(['single', 'double']), + e.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled']) + .withDescription('Decoupled mode'), + e.power_outage_memory(), e.led_disabled_night(), e.flip_indicator_light(), + ], + onEvent: preventReset, + ota: ota.zigbeeOTA, + }, { zigbeeModel: ['lumi.switch.acn031'], model: 'ZNQBKG26LM', vendor: 'Xiaomi', description: 'Aqara smart wall switch H1M (with neutral, triple rocker)', fromZigbee: [fz.on_off, fz.xiaomi_multistate_action, fz.aqara_opple, fz.xiaomi_power], - toZigbee: [tz.on_off, tz.xiaomi_switch_operation_mode_opple, tz.aqara_switch_mode_switch, - tz.xiaomi_flip_indicator_light], + toZigbee: [tz.on_off, tz.xiaomi_switch_operation_mode_opple, tz.xiaomi_flip_indicator_light], endpoint: (device) => { return {'left': 1, 'center': 2, 'right': 3}; }, From 9ac8434836224ced4afe6f1be7a8d0b8ae1cc660 Mon Sep 17 00:00:00 2001 From: zxf Date: Fri, 9 Jun 2023 00:43:23 +0800 Subject: [PATCH 2/2] fix lint --- src/devices/xiaomi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/xiaomi.ts b/src/devices/xiaomi.ts index 0d233291fc176..12ab6ec952f5c 100644 --- a/src/devices/xiaomi.ts +++ b/src/devices/xiaomi.ts @@ -3298,7 +3298,7 @@ const definitions: Definition[] = [ e.action(['single', 'double']), e.enum('operation_mode', ea.ALL, ['control_relay', 'decoupled']) .withDescription('Decoupled mode'), - e.power_outage_memory(), e.led_disabled_night(), e.flip_indicator_light(), + e.power_outage_memory(), e.led_disabled_night(), e.flip_indicator_light(), ], onEvent: preventReset, ota: ota.zigbeeOTA,