Skip to content

Commit

Permalink
Rgbwww (#756)
Browse files Browse the repository at this point in the history
  • Loading branch information
Makuna authored Jan 15, 2024
1 parent a89c09d commit 797e505
Show file tree
Hide file tree
Showing 9 changed files with 789 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/internal/NeoColorFeatures.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ License along with NeoPixel. If not, see
#include "features/Neo4ByteFeature.h"
#include "features/DotStarX4ByteFeature.h"
#include "features/DotStarL4ByteFeature.h"
#include "features/Neo6ByteFeature.h"
#include "features/Neo6xByteFeature.h"
#include "features/Neo6xxByteFeature.h"
#include "features/Neo3WordFeature.h"
Expand All @@ -53,6 +54,7 @@ License along with NeoPixel. If not, see

#include "features/NeoRgbwxxFeatures.h"
#include "features/NeoRgbcwxFeatures.h"
#include "features/NeoRgbwwwFeatures.h"
#include "features/NeoSm168x3Features.h"
#include "features/NeoSm168x4Features.h"
#include "features/NeoSm168x5Features.h"
Expand Down
2 changes: 2 additions & 0 deletions src/internal/NeoColors.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ License along with NeoPixel. If not, see
#include "colors/RgbwwColor.h"
#include "colors/Rgbww80Color.h"

#include "colors/RgbwwwColor.h"

#include "colors/SegmentDigit.h"

#include "colors/NeoGamma.h"
Expand Down
44 changes: 44 additions & 0 deletions src/internal/NeoSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,48 @@ class NeoRgbwwCurrentSettings
const uint16_t BlueTenthMilliAmpere; // in 1/10th ma
const uint16_t WarmWhiteTenthMilliAmpere; // in 1/10th ma
const uint16_t CoolWhiteTenthMilliAmpere; // in 1/10th ma
};

class NeoRgbwwwCurrentSettings
{
public:
NeoRgbwwwCurrentSettings(uint16_t red, uint16_t green, uint16_t blue, uint16_t white1, uint16_t white2, uint16_t white3) :
RedTenthMilliAmpere(red),
GreenTenthMilliAmpere(green),
BlueTenthMilliAmpere(blue),
W1TenthMilliAmpere(white1),
W2TenthMilliAmpere(white2),
W3TenthMilliAmpere(white3)
{
}

// ------------------------------------------------------------------------
// operator [] - readonly
// access elements in order by index rather than member name
// ------------------------------------------------------------------------
uint16_t operator[](size_t idx) const
{
switch (idx)
{
case 0:
return RedTenthMilliAmpere;
case 1:
return GreenTenthMilliAmpere;
case 2:
return BlueTenthMilliAmpere;
case 3:
return W1TenthMilliAmpere;
case 4:
return W2TenthMilliAmpere;
default:
return W3TenthMilliAmpere;
}
}

const uint16_t RedTenthMilliAmpere; // in 1/10th ma
const uint16_t GreenTenthMilliAmpere; // in 1/10th ma
const uint16_t BlueTenthMilliAmpere; // in 1/10th ma
const uint16_t W1TenthMilliAmpere; // in 1/10th ma
const uint16_t W2TenthMilliAmpere; // in 1/10th ma
const uint16_t W3TenthMilliAmpere; // in 1/10th ma
};
10 changes: 10 additions & 0 deletions src/internal/colors/NeoGamma.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,16 @@ template<typename T_METHOD> class NeoGamma
T_METHOD::Correct(original.WW),
T_METHOD::Correct(original.CW));
}

static RgbwwwColor Correct(const RgbwwwColor& original)
{
return RgbwwwColor(T_METHOD::Correct(original.R),
T_METHOD::Correct(original.G),
T_METHOD::Correct(original.B),
T_METHOD::Correct(original.W1),
T_METHOD::Correct(original.W2),
T_METHOD::Correct(original.W3));
}
};


Expand Down
4 changes: 3 additions & 1 deletion src/internal/colors/RgbColorIndexes.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,6 @@ const uint8_t ColorIndexB = 2;
const uint8_t ColorIndexW = 3;
const uint8_t ColorIndexWW = 3; // warmer white
const uint8_t ColorIndexCW = 4; // cooler white
const uint8_t ColorIndexY = 4;
const uint8_t ColorIndexW1 = 3;
const uint8_t ColorIndexW2 = 4;
const uint8_t ColorIndexW3 = 5;
253 changes: 253 additions & 0 deletions src/internal/colors/RgbwwwColor.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
/*-------------------------------------------------------------------------
RgbwwwColor provides a color object that can be directly consumed by NeoPixelBus
Written by Michael C. Miller.
I invest time and resources providing this open source code,
please support me by dontating (see https://github.com/Makuna/NeoPixelBus)
-------------------------------------------------------------------------
This file is part of the Makuna/NeoPixelBus library.
NeoPixelBus is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of
the License, or (at your option) any later version.
NeoPixelBus is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with NeoPixel. If not, see
<http://www.gnu.org/licenses/>.
-------------------------------------------------------------------------*/

#include <Arduino.h>
#include "../NeoSettings.h"
#include "RgbColorBase.h"
#include "RgbColor.h"
#include "RgbwColor.h"
#include "Rgb48Color.h"
#include "HslColor.h"
#include "HsbColor.h"
#include "HtmlColor.h"

#include "RgbwwwColor.h"

RgbwwwColor::RgbwwwColor(const HtmlColor& color)
{
uint32_t temp = color.Color;
B = (temp & 0xff);
temp = temp >> 8;
G = (temp & 0xff);
temp = temp >> 8;
R = (temp & 0xff);
temp = temp >> 8;
W1 = (temp & 0xff);
W2 = W1;
W3 = W1;
};

RgbwwwColor::RgbwwwColor(const HslColor& color)
{
RgbColor rgbColor(color);
*this = rgbColor;
}

RgbwwwColor::RgbwwwColor(const HsbColor& color)
{
RgbColor rgbColor(color);
*this = rgbColor;
}

uint8_t RgbwwwColor::CalculateBrightness() const
{
uint8_t colorB = static_cast<uint8_t>((static_cast<uint16_t>(R) + static_cast<uint16_t>(G) + static_cast<uint16_t>(B)) / 3);
uint8_t whiteB = static_cast<uint8_t>((static_cast<uint16_t>(W1) + static_cast<uint16_t>(W2) + static_cast<uint16_t>(W3)) / 3);

return (whiteB > colorB) ? whiteB : colorB;
}

RgbwwwColor RgbwwwColor::Dim(uint8_t ratio) const
{
// specifically avoids float math
return RgbwwwColor(_elementDim(R, ratio),
_elementDim(G, ratio),
_elementDim(B, ratio),
_elementDim(W1, ratio),
_elementDim(W2, ratio),
_elementDim(W3, ratio));
}

RgbwwwColor RgbwwwColor::Brighten(uint8_t ratio) const
{
// specifically avoids float math
return RgbwwwColor(_elementBrighten(R, ratio),
_elementBrighten(G, ratio),
_elementBrighten(B, ratio),
_elementBrighten(W1, ratio),
_elementBrighten(W2, ratio),
_elementBrighten(W3, ratio));
}

void RgbwwwColor::Darken(uint8_t delta)
{
if (R > delta)
{
R -= delta;
}
else
{
R = 0;
}

if (G > delta)
{
G -= delta;
}
else
{
G = 0;
}

if (B > delta)
{
B -= delta;
}
else
{
B = 0;
}

if (W1 > delta)
{
W1 -= delta;
}
else
{
W1 = 0;
}

if (W2 > delta)
{
W2 -= delta;
}
else
{
W2 = 0;
}

if (W3 > delta)
{
W3 -= delta;
}
else
{
W3 = 0;
}
}

void RgbwwwColor::Lighten(uint8_t delta)
{
if (IsColorLess())
{
if (W1 < Max - delta)
{
W1 += delta;
}
else
{
W1 = Max;
}

if (W2 < Max - delta)
{
W2 += delta;
}
else
{
W2 = Max;
}

if (W3 < Max - delta)
{
W3 += delta;
}
else
{
W3 = Max;
}
}
else
{
if (R < Max - delta)
{
R += delta;
}
else
{
R = Max;
}

if (G < Max - delta)
{
G += delta;
}
else
{
G = Max;
}

if (B < Max - delta)
{
B += delta;
}
else
{
B = Max;
}
}
}

RgbwwwColor RgbwwwColor::LinearBlend(const RgbwwwColor& left, const RgbwwwColor& right, float progress)
{
return RgbwwwColor( left.R + ((static_cast<int16_t>(right.R) - left.R) * progress),
left.G + ((static_cast<int16_t>(right.G) - left.G) * progress),
left.B + ((static_cast<int16_t>(right.B) - left.B) * progress),
left.W1 + ((static_cast<int16_t>(right.W1) - left.W1) * progress),
left.W2 + ((static_cast<int16_t>(right.W2) - left.W2) * progress),
left.W3 + ((static_cast<int16_t>(right.W3) - left.W3) * progress));
}

RgbwwwColor RgbwwwColor::LinearBlend(const RgbwwwColor& left, const RgbwwwColor& right, uint8_t progress)
{
return RgbwwwColor(left.R + (((static_cast<int32_t>(right.R) - left.R) * static_cast<int32_t>(progress) + 1) >> 8),
left.G + (((static_cast<int32_t>(right.G) - left.G) * static_cast<int32_t>(progress) + 1) >> 8),
left.B + (((static_cast<int32_t>(right.B) - left.B) * static_cast<int32_t>(progress) + 1) >> 8),
left.W1 + (((static_cast<int32_t>(right.W1) - left.W1) * static_cast<int32_t>(progress) + 1) >> 8),
left.W2 + (((static_cast<int32_t>(right.W2) - left.W2) * static_cast<int32_t>(progress) + 1) >> 8),
left.W3 + (((static_cast<int32_t>(right.W3) - left.W3) * static_cast<int32_t>(progress) + 1) >> 8));
}

RgbwwwColor RgbwwwColor::BilinearBlend(const RgbwwwColor& c00,
const RgbwwwColor& c01,
const RgbwwwColor& c10,
const RgbwwwColor& c11,
float x,
float y)
{
float v00 = (1.0f - x) * (1.0f - y);
float v10 = x * (1.0f - y);
float v01 = (1.0f - x) * y;
float v11 = x * y;

return RgbwwwColor(
c00.R * v00 + c10.R * v10 + c01.R * v01 + c11.R * v11,
c00.G * v00 + c10.G * v10 + c01.G * v01 + c11.G * v11,
c00.B * v00 + c10.B * v10 + c01.B * v01 + c11.B * v11,
c00.W1 * v00 + c10.W1 * v10 + c01.W1 * v01 + c11.W1 * v11,
c00.W2 * v00 + c10.W2 * v10 + c01.W2 * v01 + c11.W2 * v11,
c00.W3 * v00 + c10.W3 * v10 + c01.W3 * v01 + c11.W3 * v11);
}
Loading

0 comments on commit 797e505

Please sign in to comment.