Merge pull request #63 from Aircoookie/master

Updates

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ### Development versions after 0.9.1 release
 
+#### Build 2003251
+
+- Added Pacifica effect (tentative, doesn't yet support other colors)
+- Added Atlantica palette
+- Fixed ESP32 build of Espalexa
+
+#### Build 2003222
+
+- Fixed Alexa Whites on non-RGBW lights (bump Espalexa to 2.4.5)
+
 #### Build 2003221
 
 - Moved Cronixie driver from FX library to drawOverlay handler

wled00/FX.cpp

@@ -3094,6 +3094,7 @@ uint16_t WS2812FX::mode_plasma(void) {
   return FRAMETIME;
 } 
 
+
 /*
  * Percentage display
  * Intesity values from 0-100 turn on the leds.
@@ -3167,3 +3168,108 @@ uint16_t WS2812FX::mode_heartbeat(void) {
 
   return FRAMETIME;
 }
+
+
+//  "Pacifica"
+//  Gentle, blue-green ocean waves.
+//  December 2019, Mark Kriegsman and Mary Corey March.
+//  For Dan.
+//
+//
+// In this animation, there are four "layers" of waves of light.  
+//
+// Each layer moves independently, and each is scaled separately.
+//
+// All four wave layers are added together on top of each other, and then 
+// another filter is applied that adds "whitecaps" of brightness where the 
+// waves line up with each other more.  Finally, another pass is taken
+// over the led array to 'deepen' (dim) the blues and greens.
+//
+// The speed and scale and motion each layer varies slowly within independent 
+// hand-chosen ranges, which is why the code has a lot of low-speed 'beatsin8' functions
+// with a lot of oddly specific numeric ranges.
+//
+// These three custom blue-green color palettes were inspired by the colors found in
+// the waters off the southern coast of California, https://goo.gl/maps/QQgd97jjHesHZVxQ7
+//
+// Modified for WLED, based on https://github.com/FastLED/FastLED/blob/master/examples/Pacifica/Pacifica.ino
+//
+uint16_t WS2812FX::mode_pacifica()
+{
+  CRGBPalette16 pacifica_palette_1 = 
+    { 0x000507, 0x000409, 0x00030B, 0x00030D, 0x000210, 0x000212, 0x000114, 0x000117, 
+      0x000019, 0x00001C, 0x000026, 0x000031, 0x00003B, 0x000046, 0x14554B, 0x28AA50 };
+  CRGBPalette16 pacifica_palette_2 = 
+    { 0x000507, 0x000409, 0x00030B, 0x00030D, 0x000210, 0x000212, 0x000114, 0x000117, 
+      0x000019, 0x00001C, 0x000026, 0x000031, 0x00003B, 0x000046, 0x0C5F52, 0x19BE5F };
+  CRGBPalette16 pacifica_palette_3 = 
+    { 0x000208, 0x00030E, 0x000514, 0x00061A, 0x000820, 0x000927, 0x000B2D, 0x000C33, 
+      0x000E39, 0x001040, 0x001450, 0x001860, 0x001C70, 0x002080, 0x1040BF, 0x2060FF };
+  // Increment the four "color index start" counters, one for each wave layer.
+  // Each is incremented at a different speed, and the speeds vary over time.
+  uint16_t sCIStart1 = SEGENV.aux0, sCIStart2 = SEGENV.aux1, sCIStart3 = SEGENV.step, sCIStart4 = SEGENV.step >> 16;
+  //static uint16_t sCIStart1, sCIStart2, sCIStart3, sCIStart4;
+  uint32_t deltams = 26 + (SEGMENT.speed >> 3);
+  
+  uint16_t speedfactor1 = beatsin16(3, 179, 269);
+  uint16_t speedfactor2 = beatsin16(4, 179, 269);
+  uint32_t deltams1 = (deltams * speedfactor1) / 256;
+  uint32_t deltams2 = (deltams * speedfactor2) / 256;
+  uint32_t deltams21 = (deltams1 + deltams2) / 2;
+  sCIStart1 += (deltams1 * beatsin88(1011,10,13));
+  sCIStart2 -= (deltams21 * beatsin88(777,8,11));
+  sCIStart3 -= (deltams1 * beatsin88(501,5,7));
+  sCIStart4 -= (deltams2 * beatsin88(257,4,6));
+  SEGENV.aux0 = sCIStart1; SEGENV.aux1 = sCIStart2;
+  SEGENV.step = sCIStart4; SEGENV.step = (SEGENV.step << 16) + sCIStart3;
+
+  // Clear out the LED array to a dim background blue-green
+  //fill(132618);
+
+  uint8_t basethreshold = beatsin8( 9, 55, 65);
+  uint8_t wave = beat8( 7 );
+  
+  for( uint16_t i = 0; i < SEGLEN; i++) {
+    CRGB c = CRGB(2, 6, 10);
+    // Render each of four layers, with different scales and speeds, that vary over time
+    c += pacifica_one_layer(i, pacifica_palette_1, sCIStart1, beatsin16(3, 11 * 256, 14 * 256), beatsin8(10, 70, 130), 0-beat16(301));
+    c += pacifica_one_layer(i, pacifica_palette_2, sCIStart2, beatsin16(4,  6 * 256,  9 * 256), beatsin8(17, 40,  80),   beat16(401));
+    c += pacifica_one_layer(i, pacifica_palette_3, sCIStart3,                         6 * 256 , beatsin8(9, 10,38)   , 0-beat16(503));
+    c += pacifica_one_layer(i, pacifica_palette_3, sCIStart4,                         5 * 256 , beatsin8(8, 10,28)   ,   beat16(601));
+    
+    // Add extra 'white' to areas where the four layers of light have lined up brightly
+    uint8_t threshold = scale8( sin8( wave), 20) + basethreshold;
+    wave += 7;
+    uint8_t l = c.getAverageLight();
+    if (l > threshold) {
+      uint8_t overage = l - threshold;
+      uint8_t overage2 = qadd8(overage, overage);
+      c += CRGB(overage, overage2, qadd8(overage2, overage2));
+    }
+
+    //deepen the blues and greens
+    c.blue  = scale8(c.blue,  145); 
+    c.green = scale8(c.green, 200); 
+    c |= CRGB( 2, 5, 7);
+
+    setPixelColor(i, c.red, c.green, c.blue);
+  }
+
+  return FRAMETIME;
+}
+
+// Add one layer of waves into the led array
+CRGB WS2812FX::pacifica_one_layer(uint16_t i, CRGBPalette16& p, uint16_t cistart, uint16_t wavescale, uint8_t bri, uint16_t ioff)
+{
+  uint16_t ci = cistart;
+  uint16_t waveangle = ioff;
+  uint16_t wavescale_half = (wavescale >> 1) + 20;
+  
+  waveangle += ((120 + SEGMENT.intensity) * i); //original 250 * i
+  uint16_t s16 = sin16(waveangle) + 32768;
+  uint16_t cs = scale16(s16, wavescale_half) + wavescale_half;
+  ci += (cs * i);
+  uint16_t sindex16 = sin16(ci) + 32768;
+  uint8_t sindex8 = scale16(sindex16, 240);
+  return ColorFromPalette(p, sindex8, bri, LINEARBLEND);
+}

wled00/FX.h

@@ -95,7 +95,7 @@
 #define IS_REVERSE      ((SEGMENT.options & REVERSE )     == REVERSE     )
 #define IS_SELECTED     ((SEGMENT.options & SELECTED)     == SELECTED    )
 
-#define MODE_COUNT  101
+#define MODE_COUNT  102
 
 #define FX_MODE_STATIC                   0
 #define FX_MODE_BLINK                    1
@@ -198,6 +198,7 @@
 #define FX_MODE_PERCENT                 98
 #define FX_MODE_RIPPLE_RAINBOW          99
 #define FX_MODE_HEARTBEAT              100
+#define FX_MODE_PACIFICA               101
 
 class WS2812FX {
   typedef uint16_t (WS2812FX::*mode_ptr)(void);
@@ -387,6 +388,7 @@ class WS2812FX {
       _mode[FX_MODE_PERCENT]                 = &WS2812FX::mode_percent;
       _mode[FX_MODE_RIPPLE_RAINBOW]          = &WS2812FX::mode_ripple_rainbow;
       _mode[FX_MODE_HEARTBEAT]               = &WS2812FX::mode_heartbeat;
+      _mode[FX_MODE_PACIFICA]                = &WS2812FX::mode_pacifica;
 
       _brightness = DEFAULT_BRIGHTNESS;
       currentPalette = CRGBPalette16(CRGB::Black);
@@ -571,7 +573,8 @@ class WS2812FX {
       mode_plasma(void),
       mode_percent(void),
       mode_ripple_rainbow(void),
-      mode_heartbeat(void);
+      mode_heartbeat(void),
+      mode_pacifica(void);
       
 
   private:
@@ -621,6 +624,7 @@ class WS2812FX {
       spots_base(uint16_t);
 
     CRGB twinklefox_one_twinkle(uint32_t ms, uint8_t salt, bool cat);
+    CRGB pacifica_one_layer(uint16_t i, CRGBPalette16& p, uint16_t cistart, uint16_t wavescale, uint8_t bri, uint16_t ioff);
     
     uint32_t _lastPaletteChange = 0;
     uint32_t _lastShow = 0;
@@ -656,7 +660,7 @@ const char JSON_mode_names[] PROGMEM = R"=====([
 "Noise 1","Noise 2","Noise 3","Noise 4","Colortwinkles","Lake","Meteor","Meteor Smooth","Railway","Ripple",
 "Twinklefox","Twinklecat","Halloween Eyes","Solid Pattern","Solid Pattern Tri","Spots","Spots Fade","Glitter","Candle","Fireworks Starburst",
 "Fireworks 1D","Bouncing Balls","Sinelon","Sinelon Dual","Sinelon Rainbow","Popcorn","Drip","Plasma","Percent","Ripple Rainbow",
-"Heartbeat"
+"Heartbeat","Pacifica"
 ])=====";
 
 
@@ -666,7 +670,7 @@ const char JSON_palette_names[] PROGMEM = R"=====([
 "Pastel","Sunset 2","Beech","Vintage","Departure","Landscape","Beach","Sherbet","Hult","Hult 64",
 "Drywet","Jul","Grintage","Rewhi","Tertiary","Fire","Icefire","Cyane","Light Pink","Autumn",
 "Magenta","Magred","Yelmag","Yelblu","Orange & Teal","Tiamat","April Night","Orangery","C9","Sakura",
-"Aurora"
+"Aurora","Atlantica"
 ])=====";
 
 #endif

wled00/palettes.h

@@ -13,7 +13,7 @@
 #ifndef PalettesWLED_h
 #define PalettesWLED_h
 
-#define GRADIENT_PALETTE_COUNT 38
+#define GRADIENT_PALETTE_COUNT 39
 
 const byte ib_jul01_gp[] PROGMEM = {
     0, 194,  1,  1,
@@ -574,6 +574,14 @@ const byte Aurora_gp[] PROGMEM = {
   170,   0,243, 45,
   200,   0,135,  7,
   255,   1,  5, 45};//deep blue
+
+const byte Atlantica_gp[] PROGMEM = {
+    0,   0, 28,112, //#001C70
+   50,  32, 96,255, //#2060FF
+  100,   0,243, 45,
+  150,  12, 95, 82, //#0C5F52
+  200,  25,190, 95, //#19BE5F
+  255,  40,170, 80};//#28AA50
   
 
 // Single array of defined cpt-city color palettes.
@@ -619,6 +627,7 @@ const byte* const gGradientPalettes[] PROGMEM = {
   C9_gp,                        //48-35 C9
   Sakura_gp,                    //49-36 Sakura
   Aurora_gp,                    //50-37 Aurora
+  Atlantica_gp,                 //51-38 Atlantica
 };
 
 #endif

wled00/src/dependencies/espalexa/Espalexa.h

@@ -10,7 +10,7 @@
  */
 /*
  * @title Espalexa library
- * @version 2.4.4
+ * @version 2.4.5
  * @author Christian Schwinne
  * @license MIT
  * @contributors d-999
@@ -49,7 +49,7 @@
 #include <WiFiUdp.h>
 
 #ifdef ESPALEXA_DEBUG
- #pragma message "Espalexa 2.4.4 debug mode"
+ #pragma message "Espalexa 2.4.5 debug mode"
  #define EA_DEBUG(x)  Serial.print (x)
  #define EA_DEBUGLN(x) Serial.println (x)
 #else
@@ -164,7 +164,7 @@ private:
     json += "\",\"modelid\":\"" + modelidString(dev->getType());
     json += "\",\"manufacturername\":\"Philips\",\"productname\":\"E" + String(static_cast<uint8_t>(dev->getType()));
     json += "\",\"uniqueid\":\"" + String(encodeLightId(deviceId+1));
-    json += "\",\"swversion\":\"espalexa-2.4.4\"}";
+    json += "\",\"swversion\":\"espalexa-2.4.5\"}";
     
     return json;
   }
@@ -188,7 +188,7 @@ private:
     }
     res += "\r\nFree Heap: " + (String)ESP.getFreeHeap();
     res += "\r\nUptime: " + (String)millis();
-    res += "\r\n\r\nEspalexa library v2.4.4 by Christian Schwinne 2020";
+    res += "\r\n\r\nEspalexa library v2.4.5 by Christian Schwinne 2020";
     server->send(200, "text/plain", res);
   }
   #endif
@@ -370,9 +370,10 @@ public:
     if (!discoverable) return; //do not reply to M-SEARCH if not discoverable
     
     String request = packetBuffer;
-    if(request.indexOf("M-SEARCH") >= 0) {
+    if(request.indexOf("M-SEA") >= 0) { //M-SEARCH
       EA_DEBUGLN(request);
-      if(request.indexOf("upnp:rootdevice") > 0 || request.indexOf("asic:1") > 0 || request.indexOf("ssdp:all") > 0) {
+      //match upnp:rootdevice, device:basic:1, ssdp:all and ssdp:discover
+      if(request.indexOf("np:rootd") > 0 || request.indexOf("asic:1") > 0 || request.indexOf("dp:all") > 0 || request.indexOf("dp:dis") > 0) {
         EA_DEBUGLN("Responding search req...");
         respondToSearch();
       }

wled00/src/dependencies/espalexa/EspalexaDevice.cpp

@@ -122,37 +122,28 @@ uint32_t EspalexaDevice::getRGB()
     float temp = 10000/ _ct; //kelvins = 1,000,000/mired (and that /100)
     float r, g, b;
 
-// Cold white to warm white receiving from Alexa: _ct = 199, 234, 284, 350, 383 (from cold white to warm white)
+    if (temp <= 66) { 
-    switch (_ct) {
+      r = 255; 
-      case 199: rgb[0]=255,rgb[1]=255,rgb[2]=255;rgb[3]=255;break;
+      g = temp;
-      case 234: rgb[0]=127,rgb[1]=127,rgb[2]=127;rgb[3]=255;break;
+      g = 99.470802 * log(g) - 161.119568;
-      case 284: rgb[0]=0,rgb[1]=0,rgb[2]=0;rgb[3]=255;break;
+      if (temp <= 19) {
-      case 350: rgb[0]=130,rgb[1]=90,rgb[2]=0;rgb[3]=255;break;
+          b = 0;
-      case 383: rgb[0]=255,rgb[1]=153,rgb[2]=0;rgb[3]=255;break;
+      } else {
-      default: {
+          b = temp-10;
-        if( temp <= 66 ){ 
+          b = 138.517731 * log(b) - 305.044793;
-          r = 255; 
-          g = temp;
-          g = 99.470802 * log(g) - 161.119568;
-          if( temp <= 19){
-              b = 0;
-          } else {
-              b = temp-10;
-              b = 138.517731 * log(b) - 305.044793;
-          }
-        } else {
-          r = temp - 60;
-          r = 329.698727 * pow(r, -0.13320476);
-          g = temp - 60;
-          g = 288.12217 * pow(g, -0.07551485 );
-          b = 255;
-        }
-    
-        rgb[0] = (byte)constrain(r,0.1,255.1);
-        rgb[1] = (byte)constrain(g,0.1,255.1);
-        rgb[2] = (byte)constrain(b,0.1,255.1);
       }
+    } else {
+      r = temp - 60;
+      r = 329.698727 * pow(r, -0.13320476);
+      g = temp - 60;
+      g = 288.12217 * pow(g, -0.07551485 );
+      b = 255;
     }
+    
+    rgb[0] = (byte)constrain(r,0.1,255.1);
+    rgb[1] = (byte)constrain(g,0.1,255.1);
+    rgb[2] = (byte)constrain(b,0.1,255.1);
+    
   } else if (_mode == EspalexaColorMode::hs)
   {
     float h = ((float)_hue)/65535.0;
@@ -226,7 +217,7 @@ uint32_t EspalexaDevice::getRGB()
     rgb[1] = 255.0*g;
     rgb[2] = 255.0*b;
   }
-  _rgb = ((rgb[3] << 24) | (rgb[0] << 16) | (rgb[1] << 8) | (rgb[2]));  //white value is only >0 if Alexa did provide a CT value, RGB colors will not be touched.
+  _rgb = ((rgb[0] << 16) | (rgb[1] << 8) | (rgb[2]));
   return _rgb;
 }
 

wled00/src/dependencies/espalexa/EspalexaDevice.h

@@ -2,12 +2,13 @@
 #define EspalexaDevice_h
 
 #include "Arduino.h"
+#include <functional>
 
 typedef class EspalexaDevice;
 
-typedef void (*BrightnessCallbackFunction) (uint8_t b);
+typedef std::function<void(uint8_t b)> BrightnessCallbackFunction;
-typedef void (*DeviceCallbackFunction) (EspalexaDevice* d);
+typedef std::function<void(EspalexaDevice* d)> DeviceCallbackFunction;
-typedef void (*ColorCallbackFunction) (uint8_t br, uint32_t col);
+typedef std::function<void(uint8_t br, uint32_t col)> ColorCallbackFunction;
 
 enum class EspalexaColorMode : uint8_t { none = 0, ct = 1, hs = 2, xy = 3 };
 enum class EspalexaDeviceType : uint8_t { onoff = 0, dimmable = 1, whitespectrum = 2, color = 3, extendedcolor = 4 };

wled00/wled00.ino

@@ -7,7 +7,6 @@
  * @author Christian Schwinne
  */
 
-
 //ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).
 
 //ESP8266-01 (black) has 1MB flash and can thus fit the whole program. Use 1M(64K SPIFFS).
@@ -119,7 +118,7 @@
 #endif
 
 //version code in format yymmddb (b = daily build)
-#define VERSION 2003221
+#define VERSION 2003251
 
 char versionString[] = "0.9.1";
 

wled00/wled12_alexa.ino

@@ -61,12 +61,28 @@ void onAlexaChange(EspalexaDevice* dev)
     colorUpdated(NOTIFIER_CALL_MODE_ALEXA);
   } else //color
   {
-    uint32_t color = espalexaDevice->getRGB();
+    if (espalexaDevice->getColorMode() == EspalexaColorMode::ct) //shade of white
-    col[3] = ((color >> 24) & 0xFF);  // white color from Alexa is "pure white only" 
+    {
-    col[0] = ((color >> 16) & 0xFF);
+      uint16_t ct = espalexaDevice->getCt();
-    col[1] = ((color >>  8) & 0xFF);
+      if (useRGBW)
-    col[2] = (color & 0xFF);
+      {
-    if (useRGBW && col[3] == 0) colorRGBtoRGBW(col);  // do not touch white value if EspalexaDevice.cpp did set the white channel
+        switch (ct) { //these values empirically look good on RGBW
+          case 199: col[0]=255; col[1]=255; col[2]=255; col[3]=255; break;
+          case 234: col[0]=127; col[1]=127; col[2]=127; col[3]=255; break;
+          case 284: col[0]=  0; col[1]=  0; col[2]=  0; col[3]=255; break;
+          case 350: col[0]=130; col[1]= 90; col[2]=  0; col[3]=255; break;
+          case 383: col[0]=255; col[1]=153; col[2]=  0; col[3]=255; break;
+        }
+      } else {
+        colorCTtoRGB(ct, col);
+      }
+    } else {
+      uint32_t color = espalexaDevice->getRGB();
+    
+      col[0] = ((color >> 16) & 0xFF);
+      col[1] = ((color >>  8) & 0xFF);
+      col[2] = ( color        & 0xFF);
+    }
     colorUpdated(NOTIFIER_CALL_MODE_ALEXA);
   }
 }

wled00/wled14_colors.ino

@@ -57,10 +57,9 @@ void colorHStoRGB(uint16_t hue, byte sat, byte* rgb) //hue, sat to rgb
     case 4: rgb[0]=t,rgb[1]=p,rgb[2]=255;break;
     case 5: rgb[0]=255,rgb[1]=p,rgb[2]=q;
   }
-  if (useRGBW) colorRGBtoRGBW(col);
+  if (useRGBW && strip.rgbwMode == RGBW_MODE_LEGACY) colorRGBtoRGBW(col);
 }
 
-#ifndef WLED_DISABLE_HUESYNC
 void colorCTtoRGB(uint16_t mired, byte* rgb) //white spectrum to rgb
 {
   //this is only an approximation using WS2812B with gamma correction enabled
@@ -81,9 +80,10 @@ void colorCTtoRGB(uint16_t mired, byte* rgb) //white spectrum to rgb
   } else {
     rgb[0]=237;rgb[1]=255;rgb[2]=239;//150
   }
-  if (useRGBW) colorRGBtoRGBW(col);
+  if (useRGBW && strip.rgbwMode == RGBW_MODE_LEGACY) colorRGBtoRGBW(col);
 }
 
+#ifndef WLED_DISABLE_HUESYNC
 void colorXYtoRGB(float x, float y, byte* rgb) //coordinates to rgb (https://www.developers.meethue.com/documentation/color-conversions-rgb-xy)
 {
   float z = 1.0f - x - y;