feedc0de/NeoPixelBus
1
0
Fork 0
forked from Makuna/NeoPixelBus
Code Pull Requests Activity

Expose uint16 for direct access (#454)

Browse Source
This commit is contained in:
Michael Miller
2021-03-23 14:26:33 -07:00
committed by GitHub
parent 7dbb95401e
commit a6da4b728b
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/internal/Rgb16Color.h
View File

@@ -61,6 +61,16 @@ struct Rgb16Color : RgbColorBase
setB(brightness); setB(brightness);
}; };
// ------------------------------------------------------------------------
// Construct a Rgb16Color using a single 16bit encoded value
// CAUTION: the color value must follow a 5/6/5 encoding model otherwise an
// incorrect color will be generated
// ------------------------------------------------------------------------
Rgb16Color(uint16_t color) :
Color565(color)
{
};
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Construct a Rgb16Color using HtmlColor // Construct a Rgb16Color using HtmlColor
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@@ -99,7 +109,7 @@ struct Rgb16Color : RgbColorBase
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Construct a Rgb16Color that will have its values set in latter operations // Construct a Rgb16Color that will have its values set in latter operations
// CAUTION: The _c members are not initialized and may not be consistent // CAUTION: The Color565 member is not initialized and may not be consistent
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
Rgb16Color() Rgb16Color()
{ {
@@ -110,32 +120,32 @@ struct Rgb16Color : RgbColorBase
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
void setR(uint8_t r) void setR(uint8_t r)
{ {
_c &= 0x07ff; Color565 &= 0x07ff;
_c |= ((r & 0xf8) << 8); Color565 |= ((r & 0xf8) << 8);
}; };
uint8_t getR() const uint8_t getR() const
{ {
return (_c & 0xf800) >> 8; return (Color565 & 0xf800) >> 8;
}; };
void setG(uint8_t g) void setG(uint8_t g)
{ {
_c &= 0xf81f; Color565 &= 0xf81f;
_c |= ((g & 0xfe) << 3); Color565 |= ((g & 0xfe) << 3);
}; };
uint8_t getG() const uint8_t getG() const
{ {
return (_c & 0x07e0) >> 3; return (Color565 & 0x07e0) >> 3;
}; };
void setB(uint8_t b) void setB(uint8_t b)
{ {
_c &= 0xffe0; Color565 &= 0xffe0;
_c |= ((b & 0xf8) >> 3); Color565 |= ((b & 0xf8) >> 3);
}; };
uint8_t getB() const uint8_t getB() const
{ {
return (_c & 0x001f) << 3; return (Color565 & 0x001f) << 3;
}; };
@@ -144,7 +154,7 @@ struct Rgb16Color : RgbColorBase
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
bool operator==(const Rgb16Color& other) const bool operator==(const Rgb16Color& other) const
{ {
return (_c == other._c); return (Color565 == other.Color565);
}; };
bool operator!=(const Rgb16Color& other) const bool operator!=(const Rgb16Color& other) const
@@ -266,7 +276,6 @@ struct Rgb16Color : RgbColorBase
return total; return total;
}; };
protected: uint16_t Color565;
uint16_t _c;
}; };