From 84d4362de9f7d39de646760e491ec197ff5de930 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 8 Nov 2020 17:49:13 +0100
Subject: [PATCH] Fix L1 scaleup

---
 tasmota/xdrv_04_light.ino | 47 +++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index b6f3469f8..cfd81f2ff 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -2220,31 +2220,34 @@ void LightSetOutputs(const uint16_t *cur_col_10) {
         }
       }
     }
-  }
+  } else {
+//    char msg[24];
+//    AddLog_P(LOG_LEVEL_DEBUG, PSTR("LGT: Channels %s"), ToHex_P((const unsigned char *)cur_col_10, 10, msg, sizeof(msg)));
 
-//  char msg[24];
-//  AddLog_P(LOG_LEVEL_DEBUG, PSTR("LGT: Channels %s"), ToHex_P((const unsigned char *)cur_col_10, 10, msg, sizeof(msg)));
+    // Some devices need scaled RGB like Sonoff L1
+    // TODO, should be probably moved to the Sonoff L1 support code
+    uint32_t max = (cur_col_10[0] > cur_col_10[1] && cur_col_10[0] > cur_col_10[2]) ? cur_col_10[0] : (cur_col_10[1] > cur_col_10[2]) ? cur_col_10[1] : cur_col_10[2];   // 0..1023
+    uint8_t scale_col[3];
+    for (uint32_t i = 0; i < 3; i++) {
+      scale_col[i] = (0 == max) ? 255 : changeUIntScale(cur_col_10[i], 0, max, 0, 255);
+    }
+//    AddLog_P(LOG_LEVEL_DEBUG, PSTR("LGT: CurCol %03X %03X %03X, ScaleCol %02X %02X %02X, Max %02X"),
+//      cur_col_10[0], cur_col_10[1], cur_col_10[2], scale_col[0], scale_col[1], scale_col[2], max);
 
-  uint8_t cur_col[LST_MAX];
-  for (uint32_t i = 0; i < LST_MAX; i++) {
-    cur_col[i] = change10to8(cur_col_10[i]);
-  }
-  // Some devices need scaled RGB like Sonoff L1
-  // TODO, should be probably moved to the Sonoff L1 support code
-  uint8_t scale_col[3];
-  uint32_t max = (cur_col[0] > cur_col[1] && cur_col[0] > cur_col[2]) ? cur_col[0] : (cur_col[1] > cur_col[2]) ? cur_col[1] : cur_col[2];   // 0..255
-  for (uint32_t i = 0; i < 3; i++) {
-    scale_col[i] = (0 == max) ? 255 : (255 > max) ? changeUIntScale(cur_col[i], 0, max, 0, 255) : cur_col[i];
-  }
+    uint8_t cur_col[LST_MAX];
+    for (uint32_t i = 0; i < LST_MAX; i++) {
+      cur_col[i] = change10to8(cur_col_10[i]);
+    }
 
-  char *tmp_data = XdrvMailbox.data;
-  char *tmp_topic = XdrvMailbox.topic;
-  XdrvMailbox.data = (char*)cur_col;
-  XdrvMailbox.topic = (char*)scale_col;
-  if (XlgtCall(FUNC_SET_CHANNELS)) { /* Serviced */ }
-  else if (XdrvCall(FUNC_SET_CHANNELS)) { /* Serviced */ }
-  XdrvMailbox.data = tmp_data;
-  XdrvMailbox.topic = tmp_topic;
+    char *tmp_data = XdrvMailbox.data;
+    char *tmp_topic = XdrvMailbox.topic;
+    XdrvMailbox.data = (char*)cur_col;
+    XdrvMailbox.topic = (char*)scale_col;
+    if (XlgtCall(FUNC_SET_CHANNELS)) { /* Serviced */ }
+    else if (XdrvCall(FUNC_SET_CHANNELS)) { /* Serviced */ }
+    XdrvMailbox.data = tmp_data;
+    XdrvMailbox.topic = tmp_topic;
+  }
 }
 
 // Just apply basic Gamma to each channel