From 04caf6ffdf32af6600b58f00d6e81bb199da7946 Mon Sep 17 00:00:00 2001
From: Andrey Klimov <anklimov@gmail.com>
Date: Wed, 13 Mar 2019 00:43:33 +0300
Subject: [PATCH] RGB - to RGBW conversion algorithm changed

---
 lighthub/inputs.cpp |  2 +-
 lighthub/item.cpp   | 23 +++++++++++++++++++----
 lighthub/main.cpp   |  4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/lighthub/inputs.cpp b/lighthub/inputs.cpp
index c86917a..94c0c87 100644
--- a/lighthub/inputs.cpp
+++ b/lighthub/inputs.cpp
@@ -228,7 +228,7 @@ void Input::dht22Poll() {
     aJsonObject *emit = aJson.getObjectItem(inputObj, "emit");
     aJsonObject *item = aJson.getObjectItem(inputObj, "item");
     if (item) thermoSetCurTemp(item->valuestring, temp);
-    debugSerial << F("IN:") << pin << F(" DHT22 type. T=") << temp << F("°C H=") << humidity << F("%");
+    debugSerial << F("IN:") << pin << F(" DHT22 type. T=") << temp << F("°C H=") << humidity << F("%")<<endl;
     if (emit && temp && humidity && temp == temp && humidity == humidity) {
         char addrstr[MQTT_TOPIC_LENGTH] = "";
 #ifdef WITH_DOMOTICZ
diff --git a/lighthub/item.cpp b/lighthub/item.cpp
index eae2a10..b0cdb51 100644
--- a/lighthub/item.cpp
+++ b/lighthub/item.cpp
@@ -574,7 +574,9 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send, int subItemN)
 
 
 
-
+    int whiteOffset=0;
+    int rgbsLimit =100;
+    int rgbvLevel =255;
     switch (itemType) {
 
 #ifdef _dmxout
@@ -582,14 +584,27 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send, int subItemN)
             DmxWrite(iaddr, map(Par[0], 0, 100, 0, 255));
             break;
         case CH_RGBW: //Colour RGBW
+        // Saturation 0  - Only white
+        // 0..50 - white + RGB
+        //50..100 RGB
         {
             int k;
-            DmxWrite(iaddr + 3, k = map((100 - Par[1]) * Par[2], 0, 10000, 0, 255));
-            debugSerial<<F("W:")<<k<<endl;
+            if (Par[2]<50) { // Using white
+                            DmxWrite(iaddr + 3, map((50 - Par[1]) * Par[2], 0, 5000, 0, 255));
+                            rgbvLevel = map (Par[1],0,50,0,255);
+                            rgbsLimit = Par[1];
+                           }
+            else
+            {
+              rgbsLimit=50;
+              DmxWrite(iaddr + 3, 0);
+            }
+            //DmxWrite(iaddr + 3, k = map((100 - Par[1]) * Par[2], 0, 10000, 0, 255));
+            //debugSerial<<F("W:")<<k<<endl;
         }
         case CH_RGB: // RGB
         {
-            CRGB rgb = CHSV(map(Par[0], 0, 365, 0, 255), map(Par[1], 0, 100, 0, 255), map(Par[2], 0, 100, 0, 255));
+            CRGB rgb = CHSV(map(Par[0], 0, 365, 0, 255), map(Par[1], 0, rgbsLimit, 0, 255), map(Par[2], 0, 100, 0, rgbvLevel));
             DmxWrite(iaddr, rgb.r);
             DmxWrite(iaddr + 1, rgb.g);
             DmxWrite(iaddr + 2, rgb.b);
diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 74e1425..3999c72 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -920,7 +920,7 @@ int loadConfigFromEEPROM()
         root = aJson.parse(&as);
         if (!root) {
             debugSerial<<F("\nload failed\n");
-            return 0;  
+            return 0;
         }
         debugSerial<<F("\nLoaded\n");
         applyConfig();
@@ -960,7 +960,7 @@ int mqttConfigResp(char *as) {
     root = aJson.parse(as);
 
     if (!root) {
-        debugSerial<<F("\nload failed");
+        debugSerial<<F("\nload failed\n");
         return 0;
     }
     debugSerial<<F("\nLoaded");