From 514f3e7357b8bcbd481c1c1512ce8c1488f1f933 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Wed, 22 Jan 2020 21:37:23 +0100
Subject: [PATCH] Fix ``RGBWWTable`` ignored (#7572)

---
 tasmota/CHANGELOG.md      | 1 +
 tasmota/xdrv_04_light.ino | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 9285bdda1..b35d22064 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Add most SetOptions as defines to my_user_config.h
 - Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
 - Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
+- Fix ``RGBWWTable`` ignored (#7572)
 
 ### 8.1.0.3 20200106
 
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 3df7b43a0..2de7432a0 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1799,6 +1799,14 @@ void LightAnimate(void)
         }
       }
 
+      // Apply RGBWWTable only if Settings.rgbwwTable[4] != 0
+      if (0 != Settings.rgbwwTable[4]) {
+        for (uint32_t i = 0; i<Light.subtype; i++) {
+          uint32_t adjust = change8to10(Settings.rgbwwTable[i]);
+          cur_col_10[i] = changeUIntScale(cur_col_10[i], 0, 1023, 0, adjust);
+        }
+      }
+
       // final adjusments for PMW, post-gamma correction
       for (uint32_t i = 0; i < LST_MAX; i++) {
         // scale from 0..1023 to 0..pwm_range, but keep any non-zero value to at least 1