From cd699e1801e54f2b88dbb4aa12a94fefd902b385 Mon Sep 17 00:00:00 2001 From: "Sebastian (Iglu)" <71284889+iglu-sebastian@users.noreply.github.com> Date: Fri, 28 May 2021 07:17:43 +0000 Subject: [PATCH 1/3] Modify TS0216 to map volume 100 -> 0 and 10 -> 100 --- converters/fromZigbee.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/converters/fromZigbee.js b/converters/fromZigbee.js index f5affbf2cd221..e0ec90b1e72cc 100644 --- a/converters/fromZigbee.js +++ b/converters/fromZigbee.js @@ -2002,7 +2002,9 @@ const converters = { convert: (model, msg, publish, options, meta) => { const result = {}; if (msg.data.hasOwnProperty('maxDuration')) result['duration'] = msg.data.maxDuration; - if (msg.data.hasOwnProperty('2')) result['volume'] = msg.data['2']; + if (msg.data.hasOwnProperty('2')) { + result['volume'] = mapNumberRange(msg.data['2'], 100, 10, 0, 100); + }; if (msg.data.hasOwnProperty('61440')) { result['alarm'] = (msg.data['61440'] == 0) ? false : true; } From d02ea506d9fa0e7cda5ecc5d125a610f9fa5e2af Mon Sep 17 00:00:00 2001 From: "Sebastian (Iglu)" <71284889+iglu-sebastian@users.noreply.github.com> Date: Fri, 28 May 2021 07:19:13 +0000 Subject: [PATCH 2/3] Modify TS0216 to map volume 0 -> 100 and 100 -> 10 --- converters/toZigbee.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/converters/toZigbee.js b/converters/toZigbee.js index 1f1ec434a491a..13c9d31c228bf 100644 --- a/converters/toZigbee.js +++ b/converters/toZigbee.js @@ -4590,7 +4590,7 @@ const converters = { ts0216_volume: { key: ['volume'], convertSet: async (entity, key, value, meta) => { - await entity.write('ssIasWd', {0x0002: {value: value, type: 0x20}}); + await entity.write('ssIasWd', {0x0002: {value: utils.mapNumberRange(value, 0, 100, 100, 10), type: 0x20}}); }, convertGet: async (entity, key, meta) => { await entity.read('ssIasWd', [0x0002]); From 15048c1dd76cd1778667c9a931253f570c7c0749 Mon Sep 17 00:00:00 2001 From: "Sebastian (Iglu)" <71284889+iglu-sebastian@users.noreply.github.com> Date: Fri, 28 May 2021 07:24:22 +0000 Subject: [PATCH 3/3] Fix extra semicolon --- converters/fromZigbee.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/converters/fromZigbee.js b/converters/fromZigbee.js index e0ec90b1e72cc..c77488913e125 100644 --- a/converters/fromZigbee.js +++ b/converters/fromZigbee.js @@ -2004,7 +2004,7 @@ const converters = { if (msg.data.hasOwnProperty('maxDuration')) result['duration'] = msg.data.maxDuration; if (msg.data.hasOwnProperty('2')) { result['volume'] = mapNumberRange(msg.data['2'], 100, 10, 0, 100); - }; + } if (msg.data.hasOwnProperty('61440')) { result['alarm'] = (msg.data['61440'] == 0) ? false : true; }