diff options
| author | Daniel Garcia <danielgarcia@gmail.com> | 2016-02-17 08:28:08 +0300 |
|---|---|---|
| committer | Daniel Garcia <danielgarcia@gmail.com> | 2016-02-17 08:28:08 +0300 |
| commit | 84d092fd67a99dc514c0381018313800ef45262c (patch) | |
| tree | bf85dbbe96b88152ca99840aefc9ff916c5b2f6d | |
| parent | 4455943ce06cc73bb729bbc5f69530b817617876 (diff) | |
| parent | 2621d6f626bbfc694d2c6ad56004bfc8be1bd340 (diff) | |
Merge branch 'scale8fix' of https://github.com/FastLED/FastLED into scale8fixscale8fix
| -rw-r--r-- | hsv2rgb.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/hsv2rgb.cpp b/hsv2rgb.cpp index a7154dfe..b4d76a1d 100644 --- a/hsv2rgb.cpp +++ b/hsv2rgb.cpp @@ -272,6 +272,7 @@ void hsv2rgb_spectrum( const CHSV& hsv, CRGB& rgb) #define K255 255 #define K171 171 +#define K170 170 #define K85 85 void hsv2rgb_rainbow( const CHSV& hsv, CRGB& rgb) @@ -320,7 +321,7 @@ void hsv2rgb_rainbow( const CHSV& hsv, CRGB& rgb) #endif } - uint8_t third = scale8( offset8, (256 / 3)); + uint8_t third = scale8( offset8, (256 / 3)); // max = 85 uint8_t r, g, b; @@ -346,9 +347,9 @@ void hsv2rgb_rainbow( const CHSV& hsv, CRGB& rgb) FORCE_REFERENCE(b); } if( Y2 ) { - r = K171 + third; + r = K170 + third; //uint8_t twothirds = (third << 1); - uint8_t twothirds = scale8( offset8, ((256 * 2) / 3)); + uint8_t twothirds = scale8( offset8, ((256 * 2) / 3)); // max=170 g = K85 + twothirds; b = 0; FORCE_REFERENCE(b); @@ -362,9 +363,9 @@ void hsv2rgb_rainbow( const CHSV& hsv, CRGB& rgb) //case 2: // Y -> G if( Y1 ) { //uint8_t twothirds = (third << 1); - uint8_t twothirds = scale8( offset8, ((256 * 2) / 3)); + uint8_t twothirds = scale8( offset8, ((256 * 2) / 3)); // max=170 r = K171 - twothirds; - g = K171 + third; + g = K170 + third; b = 0; FORCE_REFERENCE(b); } @@ -394,8 +395,8 @@ void hsv2rgb_rainbow( const CHSV& hsv, CRGB& rgb) r = 0; FORCE_REFERENCE(r); //uint8_t twothirds = (third << 1); - uint8_t twothirds = scale8( offset8, ((256 * 2) / 3)); - g = K171 - twothirds; + uint8_t twothirds = scale8( offset8, ((256 * 2) / 3)); // max=170 + g = K171 - twothirds; //K170? b = K85 + twothirds; } else { @@ -419,7 +420,7 @@ void hsv2rgb_rainbow( const CHSV& hsv, CRGB& rgb) } else { // 111 //case 7: // K -> R - r = K171 + third; + r = K170 + third; g = 0; FORCE_REFERENCE(g); b = K85 - third; |