Merge branch 'master' of https://github.com/FastLED/FastLED

Needed to make git happy

4 files changed, 14 insertions, 6 deletions

diff --git a/README.md b/README.md
index 831baea1..58e7e500 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ How quickly can you get up and running with the library?  Here's a simple blink
 
 ## Supported LED chipsets
 
-Here's a list of all the LED chipsets are supported.  More details on the led chipsets are included *TODO: Link to wiki page*
+Here's a list of all the LED chipsets are supported.  More details on the led chipsets are included [on our wiki page](https://github.com/FastLED/FastLED/wiki/Chipset-reference)
 
 * Adafruit's DotStars - AKA the APA102
 * Adafruit's Neopixel - aka the WS2812B (also WS2811/WS2812/WS2813, also supported in lo-speed mode) - a 3 wire addressable led chipset
diff --git a/examples/NoisePlusPalette/NoisePlusPalette.ino b/examples/NoisePlusPalette/NoisePlusPalette.ino
index 4670cc38..aa360b7c 100644
--- a/examples/NoisePlusPalette/NoisePlusPalette.ino
+++ b/examples/NoisePlusPalette/NoisePlusPalette.ino
@@ -15,7 +15,7 @@ const bool    kMatrixSerpentineLayout = true;
 
 // This example combines two features of FastLED to produce a remarkable range of
 // effects from a relatively small amount of code.  This example combines FastLED's 
-// color palette lookup functions with FastLED's Perlin/simplex noise generator, and
+// color palette lookup functions with FastLED's Perlin noise generator, and
 // the combination is extremely powerful.
 //
 // You might want to look at the "ColorPalette" and "Noise" examples separately
diff --git a/src/noise.h b/src/noise.h
index 7355e23e..8a0db3f4 100644
--- a/src/noise.h
+++ b/src/noise.h
@@ -9,11 +9,11 @@ FASTLED_NAMESPACE_BEGIN
 /// Noise functions provided by the library.
 
 ///@defgroup Noise Noise functions
-///Simplex noise function definitions
+///Perlin noise function definitions
 ///@{
 /// @name scaled 16 bit noise functions
 ///@{
-/// 16 bit, fixed point implementation of perlin's Simplex Noise.  Coordinates are
+/// 16 bit, fixed point implementation of Perlin's noise.  Coordinates are
 /// 16.16 fixed point values, 32 bit integers with integral coordinates in the high 16
 /// bits and fractional in the low 16 bits, and the function takes 1d, 2d, and 3d coordinate
 /// values.  These functions are scaled to return 0-65535
@@ -34,7 +34,7 @@ extern int16_t inoise16_raw(uint32_t x);
 
 /// @name 8 bit scaled noise functions
 ///@{
-/// 8 bit, fixed point implementation of perlin's Simplex Noise.  Coordinates are
+/// 8 bit, fixed point implementation of Perlin's noise.  Coordinates are
 /// 8.8 fixed point values, 16 bit integers with integral coordinates in the high 8
 /// bits and fractional in the low 8 bits, and the function takes 1d, 2d, and 3d coordinate
 /// values.  These functions are scaled to return 0-255
diff --git a/src/pixeltypes.h b/src/pixeltypes.h
index 6e91723d..f28c2c67 100644
--- a/src/pixeltypes.h
+++ b/src/pixeltypes.h
@@ -353,6 +353,14 @@ struct CRGB {
     }
 
     /// return a CRGB object that is a scaled down version of this object
+    inline CRGB scale8 (uint8_t scaledown ) const
+    {
+        CRGB out = *this;
+        nscale8x3( out.r, out.g, out.b, scaledown);
+        return out;
+    }
+
+    /// return a CRGB object that is a scaled down version of this object
     inline CRGB scale8 (const CRGB & scaledown ) const
     {
         CRGB out;
@@ -412,7 +420,7 @@ struct CRGB {
     }
 
     /// invert each channel
-    inline CRGB operator- ()
+    inline CRGB operator- () const
     {
         CRGB retval;
         retval.r = 255 - r;