Support for Fw1906

platformio.ini

@@ -177,7 +177,7 @@ lib_compat_mode = strict
 lib_deps =
     fastled/FastLED @ 3.5.0
     IRremoteESP8266 @ 2.8.2
-    makuna/NeoPixelBus @ 2.7.5
+    https://github.com/Makuna/NeoPixelBus.git#978b62f84137266bc2a47ea49759c1b15e2c8f5c
     https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.7
   #For use of the TTGO T-Display ESP32 Module with integrated TFT display uncomment the following line
     #TFT_eSPI

wled00/bus_manager.cpp

@@ -11,7 +11,6 @@
 
 //colors.cpp
 uint32_t colorBalanceFromKelvin(uint16_t kelvin, uint32_t rgb);
-uint16_t approximateKelvinFromRGB(uint32_t rgb);
 void colorRGBtoRGBW(byte* rgb);
 
 //udp.cpp
@@ -147,8 +146,9 @@ void BusDigital::setStatusPixel(uint32_t c) {
 }
 
 void IRAM_ATTR BusDigital::setPixelColor(uint16_t pix, uint32_t c) {
-  if (_type == TYPE_SK6812_RGBW || _type == TYPE_TM1814 || _type == TYPE_WS2812_1CH_X3) c = autoWhiteCalc(c);
+  if (_type == TYPE_FW1906 || _type == TYPE_SK6812_RGBW || _type == TYPE_TM1814 || _type == TYPE_WS2812_1CH_X3) c = autoWhiteCalc(c);
   if (_cct >= 1900) c = colorBalanceFromKelvin(_cct, c); //color correction from CCT
+  if (_type == TYPE_FW1906) calculateCCT(c, PolyBus::cctWW, PolyBus::cctCW); // FW1906 ignores W component in c
   if (reversed) pix = _len - pix -1;
   else pix += _skip;
   uint8_t co = _colorOrderMap.getPixelColorOrder(pix+_start, _colorOrder);
@@ -253,29 +253,10 @@ void BusPwm::setPixelColor(uint16_t pix, uint32_t c) {
   uint8_t g = G(c);
   uint8_t b = B(c);
   uint8_t w = W(c);
-  uint8_t cct = 0; //0 - full warm white, 255 - full cold white
-  if (_cct > -1) {
-    if (_cct >= 1900)    cct = (_cct - 1900) >> 5;
-    else if (_cct < 256) cct = _cct;
-  } else {
-    cct = (approximateKelvinFromRGB(c) - 1900) >> 5;
-  }
-
+
   uint8_t ww, cw;
-  #ifdef WLED_USE_IC_CCT
-  ww = w;
-  cw = cct;
-  #else
-  //0 - linear (CCT 127 = 50% warm, 50% cold), 127 - additive CCT blending (CCT 127 = 100% warm, 100% cold)
-  if (cct       < _cctBlend) ww = 255;
-  else ww = ((255-cct) * 255) / (255 - _cctBlend);
-
-  if ((255-cct) < _cctBlend) cw = 255;
-  else                       cw = (cct * 255) / (255 - _cctBlend);
-
-  ww = (w * ww) / 255; //brightness scaling
-  cw = (w * cw) / 255;
-  #endif
+
+  calculateCCT(c, ww, cw);
 
   switch (_type) {
     case TYPE_ANALOG_1CH: //one channel (white), relies on auto white calculation
@@ -457,12 +438,15 @@ uint32_t BusManager::memUsage(BusConfig &bc) {
     if (type == TYPE_UCS8903 || type == TYPE_UCS8904) len *= 2; // 16-bit LEDs
     #ifdef ESP8266
       if (bc.pins[0] == 3) { //8266 DMA uses 5x the mem
+        if (type == TYPE_FW1906) return len*25; //GRBCW
         if (type > 28) return len*20; //RGBW
         return len*15;
       }
+      if (type == TYPE_FW1906) return len*5; //GRBCW
       if (type > 28) return len*4; //RGBW
       return len*3;
     #else //ESP32 RMT uses double buffer?
+      if (type == TYPE_FW1906) return len*10; //GRBCW
       if (type > 28) return len*8; //RGBW
       return len*6;
     #endif

wled00/bus_manager.h

@@ -7,6 +7,9 @@
 
 #include "const.h"
 
+//colors.cpp
+uint16_t approximateKelvinFromRGB(uint32_t rgb);
+
 #define GET_BIT(var,bit)    (((var)>>(bit))&0x01)
 #define SET_BIT(var,bit)    ((var)|=(uint16_t)(0x0001<<(bit)))
 #define UNSET_BIT(var,bit)  ((var)&=(~(uint16_t)(0x0001<<(bit))))
@@ -129,14 +132,14 @@ class Bus {
     }
     virtual bool hasWhite() { return Bus::hasWhite(_type); }
     static  bool hasWhite(uint8_t type) {
-      if ((type >= TYPE_WS2812_1CH && type <= TYPE_WS2812_WWA) || type == TYPE_SK6812_RGBW || type == TYPE_TM1814) return true; // digital types with white channel
+      if ((type >= TYPE_WS2812_1CH && type <= TYPE_WS2812_WWA) || type == TYPE_SK6812_RGBW || type == TYPE_TM1814 || type == TYPE_FW1906) return true; // digital types with white channel
       if (type > TYPE_ONOFF && type <= TYPE_ANALOG_5CH && type != TYPE_ANALOG_3CH) return true; // analog types with white channel
       if (type == TYPE_NET_DDP_RGBW) return true; // network types with white channel
       return false;
     }
     virtual bool hasCCT() {
       if (_type == TYPE_WS2812_2CH_X3 || _type == TYPE_WS2812_WWA ||
-          _type == TYPE_ANALOG_2CH    || _type == TYPE_ANALOG_5CH) return true;
+          _type == TYPE_ANALOG_2CH    || _type == TYPE_ANALOG_5CH || _type == TYPE_FW1906) return true;
       return false;
     }
     static void setCCT(uint16_t cct) {
@@ -150,6 +153,32 @@ class Bus {
         if (_cctBlend > WLED_MAX_CCT_BLEND) _cctBlend = WLED_MAX_CCT_BLEND;
       #endif
     }
+    static void calculateCCT(uint32_t c, uint8_t &ww, uint8_t &cw) {
+      uint8_t cct = 0; //0 - full warm white, 255 - full cold white
+      uint8_t w = byte(c >> 24);
+
+      if (_cct > -1) {
+        if (_cct >= 1900)    cct = (_cct - 1900) >> 5;
+        else if (_cct < 256) cct = _cct;
+      } else {
+        cct = (approximateKelvinFromRGB(c) - 1900) >> 5;
+      }
+
+      #ifdef WLED_USE_IC_CCT
+      ww = w;
+      cw = cct;
+      #else
+      //0 - linear (CCT 127 = 50% warm, 50% cold), 127 - additive CCT blending (CCT 127 = 100% warm, 100% cold)
+      if (cct       < _cctBlend) ww = 255;
+      else ww = ((255-cct) * 255) / (255 - _cctBlend);
+
+      if ((255-cct) < _cctBlend) cw = 255;
+      else                       cw = (cct * 255) / (255 - _cctBlend);
+
+      ww = (w * ww) / 255; //brightness scaling
+      cw = (w * cw) / 255;
+      #endif
+    }
     inline        void    setAutoWhiteMode(uint8_t m) { if (m < 5) _autoWhiteMode = m; }
     inline        uint8_t getAutoWhiteMode()          { return _autoWhiteMode; }
     inline static void    setGlobalAWMode(uint8_t m)  { if (m < 5) _gAWM = m; else _gAWM = AW_GLOBAL_DISABLED; }