esp8266Compiled

const & in template causes near 100 bytes extra code, so removed
Makuna · Mar 20, 2016 · 0b68628 · 0b68628
1 parent 3dbfae7
commit 0b68628
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/examples/NeoPixelGamma/NeoPixelGamma.ino b/examples/NeoPixelGamma/NeoPixelGamma.ino
@@ -19,8 +19,8 @@ NeoPixelBus<NeoGrbFeature, Neo800KbpsMethod> strip(PixelCount, PixelPin);
 
 // uncomment only one of these to compare memory use or speed
 //
-// NeoGamma<NeoGammaEquationMethod> gamma;
-NeoGamma<NeoGammaTableMethod> gamma;
+// NeoGamma<NeoGammaEquationMethod> colorGamma;
+NeoGamma<NeoGammaTableMethod> colorGamma;
 
 void DrawPixels(bool corrected, HslColor startColor, HslColor stopColor)
 {
@@ -30,7 +30,7 @@ void DrawPixels(bool corrected, HslColor startColor, HslColor stopColor)
         RgbColor color = HslColor::LinearBlend(startColor, stopColor, progress);
         if (corrected)
         {
-            color = gamma.Correct(color);
+            color = colorGamma.Correct(color);
         }
         strip.SetPixelColor(index, color);
     }

diff --git a/src/NeoPixelBus.h b/src/NeoPixelBus.h
@@ -133,7 +133,7 @@ template<typename T_COLOR_FEATURE, typename T_METHOD> class NeoPixelBus
         return _countPixels;
     };
 
-    void SetPixelColor(uint16_t indexPixel, const typename T_COLOR_FEATURE::ColorObject& color)
+    void SetPixelColor(uint16_t indexPixel, typename T_COLOR_FEATURE::ColorObject color)
     {
         if (indexPixel < _countPixels)
         {

diff --git a/src/internal/HtmlColor.h b/src/internal/HtmlColor.h
@@ -62,6 +62,19 @@ struct HtmlColor
     {
     };
 
+    // ------------------------------------------------------------------------
+    // Comparison operators
+    // ------------------------------------------------------------------------
+    bool operator==(const HtmlColor& other) const
+    {
+        return (Color == other.Color);
+    };
+
+    bool operator!=(const HtmlColor& other) const
+    {
+        return !(*this == other);
+    };
+
     // ------------------------------------------------------------------------
     // BilinearBlend between four colors by the amount defined by 2d variable
     // c00 - upper left quadrant color

diff --git a/src/internal/RgbColor.h b/src/internal/RgbColor.h
@@ -79,6 +79,9 @@ struct RgbColor
     {
     };
 
+    // ------------------------------------------------------------------------
+    // Comparison operators
+    // ------------------------------------------------------------------------
     bool operator==(const RgbColor& other) const
     {
         return (R == other.R && G == other.G && B == other.B);

diff --git a/src/internal/RgbwColor.h b/src/internal/RgbwColor.h
@@ -86,6 +86,9 @@ struct RgbwColor
     {
     };
 
+    // ------------------------------------------------------------------------
+    // Comparison operators
+    // ------------------------------------------------------------------------
     bool operator==(const RgbwColor& other) const
     {
         return (R == other.R && G == other.G && B == other.B && W == other.W);