From afee5096d8b42f683333615da11ea923a0988517 Mon Sep 17 00:00:00 2001
From: Ivan Podogov <ginkage@yandex.ru>
Date: Sat, 21 Dec 2019 08:46:59 +0000
Subject: [PATCH] Avoid double publish for ICTC-G-1

Currently, ictcg1 method publishes its payload itself, which is always followed by herdsman publishing the same payload.
This change significantly (roughly by half) reduces messages rate.
---
 converters/fromZigbee.js | 46 +++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/converters/fromZigbee.js b/converters/fromZigbee.js
index c512662a45b16..11c4e0e08ed89 100644
--- a/converters/fromZigbee.js
+++ b/converters/fromZigbee.js
@@ -108,25 +108,23 @@ const ictcg1 = (model, msg, publish, options, action) => {
         const direction = msg.data.movemode === 1 ? 'left' : 'right';
         s.direction = direction;
         payload.action = `rotate_${direction}`;
-    } else if (action === 'stop' || action === 'level') {
-        if (action === 'level') {
-            s.value = msg.data.level;
-            const direction = s.value === 0 ? 'left' : 'right';
-            payload.action = `rotate_${direction}_quick`;
-            payload.brightness = s.value;
-        } else {
-            if (s.direction) {
-                const duration = Date.now() - s.since;
-                const delta = Math.round(rate * (duration / 10) * (s.direction === 'left' ? -1 : 1));
-                const newValue = s.value + delta;
-                if (newValue >= 0 && newValue <= 255) {
-                    s.value = newValue;
-                }
+    } else if (action === 'level') {
+        s.value = msg.data.level;
+        const direction = s.value === 0 ? 'left' : 'right';
+        payload.action = `rotate_${direction}_quick`;
+        payload.brightness = s.value;
+    } else if (action === 'stop') {
+        if (s.direction) {
+            const duration = Date.now() - s.since;
+            const delta = Math.round(rate * (duration / 10) * (s.direction === 'left' ? -1 : 1));
+            const newValue = s.value + delta;
+            if (newValue >= 0 && newValue <= 255) {
+                s.value = newValue;
             }
-            payload.action = 'rotate_stop';
-            payload.brightness = s.value;
-            s.direction = false;
         }
+        payload.action = 'rotate_stop';
+        payload.brightness = s.value;
+        s.direction = false;
     }
     if (s.timerId) {
         clearInterval(s.timerId);
@@ -145,7 +143,7 @@ const ictcg1 = (model, msg, publish, options, action) => {
             s.publish(payload);
         }, 200);
     }
-    s.publish(payload);
+    return payload.brightness;
 };
 
 const ratelimitedDimmer = (model, msg, publish, options) => {
@@ -1855,25 +1853,25 @@ const converters = {
         cluster: 'genLevelCtrl',
         type: 'commandStop',
         convert: (model, msg, publish, options) => {
-            ictcg1(model, msg, publish, options, 'stop');
-            return {action: `rotate_stop`};
+            const value = ictcg1(model, msg, publish, options, 'stop');
+            return {action: `rotate_stop`, brightness: value};
         },
     },
     cmd_stop_with_onoff: {
         cluster: 'genLevelCtrl',
         type: 'commandStopWithOnOff',
         convert: (model, msg, publish, options) => {
-            ictcg1(model, msg, publish, options, 'stop');
-            return {action: `rotate_stop`};
+            const value = ictcg1(model, msg, publish, options, 'stop');
+            return {action: `rotate_stop`, brightness: value};
         },
     },
     cmd_move_to_level_with_onoff: {
         cluster: 'genLevelCtrl',
         type: 'commandMoveToLevelWithOnOff',
         convert: (model, msg, publish, options) => {
-            ictcg1(model, msg, publish, options, 'level');
+            const value = ictcg1(model, msg, publish, options, 'level');
             const direction = msg.data.level === 0 ? 'left' : 'right';
-            return {action: `rotate_${direction}_quick`, level: msg.data.level};
+            return {action: `rotate_${direction}_quick`, level: msg.data.level, brightness: value};
         },
     },
     iris_3320L_contact: {