Merge fix

Author: troyhacks

wled00/colors.cpp

@@ -119,33 +119,33 @@ IRAM_ATTR_YN __attribute__((hot)) uint32_t color_fade(uint32_t c1, uint8_t amoun
 
 
 // 1:1 replacement of fastled function optimized for ESP, slightly faster, more accurate and uses less flash (~ -200bytes)
-CRGB ColorFromPaletteWLED(const CRGBPalette16& pal, unsigned index, uint8_t brightness, TBlendType blendType)
-{
-   if (blendType == LINEARBLEND_NOWRAP) {
-     index = (index*240) >> 8; // Blend range is affected by lo4 blend of values, remap to avoid wrapping
-  }
-    unsigned hi4 = byte(index) >> 4;
-    const CRGB* entry = (CRGB*)( (uint8_t*)(&(pal[0])) + (hi4 * sizeof(CRGB)));
-    unsigned red1   = entry->r;
-    unsigned green1 = entry->g;
-    unsigned blue1  = entry->b;
-    if (blendType != NOBLEND) {
-      if (hi4 == 15) entry = &(pal[0]);
-      else ++entry;
-      unsigned f2 = ((index & 0x0F) << 4) + 1; // +1 so we scale by 256 as a max value, then result can just be shifted by 8
-      unsigned f1 = (257 - f2); // f2 is 1 minimum, so this is 256 max
-      red1   = (red1 * f1 + (unsigned)entry->r * f2) >> 8;
-      green1 = (green1 * f1 + (unsigned)entry->g * f2) >> 8;
-      blue1  = (blue1 * f1 + (unsigned)entry->b * f2) >> 8;
-    }
-    if (brightness < 255) { // note: zero checking could be done to return black but that is hardly ever used so it is omitted
-      uint32_t scale = brightness + 1; // adjust for rounding (bitshift)
-      red1   = (red1 * scale) >> 8;
-      green1 = (green1 * scale) >> 8;
-      blue1  = (blue1 * scale) >> 8;
-  }
-    return CRGB(red1,green1,blue1);
-}
+// CRGB ColorFromPaletteWLED(const CRGBPalette16& pal, unsigned index, uint8_t brightness, TBlendType blendType)
+// {
+//    if (blendType == LINEARBLEND_NOWRAP) {
+//      index = (index*240) >> 8; // Blend range is affected by lo4 blend of values, remap to avoid wrapping
+//   }
+//     unsigned hi4 = byte(index) >> 4;
+//     const CRGB* entry = (CRGB*)( (uint8_t*)(&(pal[0])) + (hi4 * sizeof(CRGB)));
+//     unsigned red1   = entry->r;
+//     unsigned green1 = entry->g;
+//     unsigned blue1  = entry->b;
+//     if (blendType != NOBLEND) {
+//       if (hi4 == 15) entry = &(pal[0]);
+//       else ++entry;
+//       unsigned f2 = ((index & 0x0F) << 4) + 1; // +1 so we scale by 256 as a max value, then result can just be shifted by 8
+//       unsigned f1 = (257 - f2); // f2 is 1 minimum, so this is 256 max
+//       red1   = (red1 * f1 + (unsigned)entry->r * f2) >> 8;
+//       green1 = (green1 * f1 + (unsigned)entry->g * f2) >> 8;
+//       blue1  = (blue1 * f1 + (unsigned)entry->b * f2) >> 8;
+//     }
+//     if (brightness < 255) { // note: zero checking could be done to return black but that is hardly ever used so it is omitted
+//       uint32_t scale = brightness + 1; // adjust for rounding (bitshift)
+//       red1   = (red1 * scale) >> 8;
+//       green1 = (green1 * scale) >> 8;
+//       blue1  = (blue1 * scale) >> 8;
+//   }
+//     return CRGB(red1,green1,blue1);
+// }
 
 void setRandomColor(byte* rgb)
 {