Makuna/NeoPixelBus
1
0
Fork 1
mirror of https://github.com/Makuna/NeoPixelBus.git synced 2025-08-26 05:40:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Lpd6803ColorFeatures.h (#403)

Browse Source 
endianess fixes
This commit is contained in:
Michael Miller
2021-01-15 13:03:17 -08:00
committed by GitHub
parent 3910763e57
commit c9689ef694
1 changed files with 51 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/internal/Lpd6803ColorFeatures.h
View File

@@ -104,6 +104,23 @@ public:
} }
typedef RgbColor ColorObject; typedef RgbColor ColorObject;
protected:
static void encodePixel(uint8_t c1, uint8_t c2, uint8_t c3, uint16_t* color555)
{
*color555 = (0x8000 |
((c1 & 0xf8) << 7) |
((c2 & 0xf8) << 2) |
((c3 & 0xf8) >> 3));
}
static void decodePixel(uint16_t color555, uint8_t* c1, uint8_t* c2, uint8_t* c3)
{
*c1 = (color555 >> 7) & 0xf8;
*c2 = (color555 >> 2) & 0xf8;
*c3 = (color555 << 3) & 0xf8;
}
}; };
class Lpd6803BrgFeature : public Lpd68033Elements class Lpd6803BrgFeature : public Lpd68033Elements
@@ -111,17 +128,27 @@ class Lpd6803BrgFeature : public Lpd68033Elements
public: public:
static void applyPixelColor(uint8_t* pPixels, uint16_t indexPixel, ColorObject color) static void applyPixelColor(uint8_t* pPixels, uint16_t indexPixel, ColorObject color)
{ {
uint16_t* p = reinterpret_cast<uint16_t*>( getPixelAddress(pPixels, indexPixel) ); uint8_t* p = getPixelAddress(pPixels, indexPixel);
uint16_t color555;
*p = encodePixel(color); encodePixel(color.B, color.R, color.G, &color555);
*p++ = color555 >> 8;
*p = color555 & 0xff;
} }
static ColorObject retrievePixelColor(const uint8_t* pPixels, uint16_t indexPixel) static ColorObject retrievePixelColor(const uint8_t* pPixels, uint16_t indexPixel)
{ {
ColorObject color; ColorObject color;
const uint16_t* p = reinterpret_cast<const uint16_t*>( getPixelAddress(pPixels, indexPixel) ); const uint8_t* p = getPixelAddress(pPixels, indexPixel);
return decodePixel(*p); uint16_t color555;
color555 = ((*p++) << 8);
color555 |= (*p);
decodePixel(color555, &color.B, &color.R, &color.G);
return color;
} }
static ColorObject retrievePixelColor_P(PGM_VOID_P pPixels, uint16_t indexPixel) static ColorObject retrievePixelColor_P(PGM_VOID_P pPixels, uint16_t indexPixel)
@@ -129,33 +156,11 @@ public:
ColorObject color; ColorObject color;
const uint8_t* p = getPixelAddress((const uint8_t*)pPixels, indexPixel); const uint8_t* p = getPixelAddress((const uint8_t*)pPixels, indexPixel);
uint16_t color555 = pgm_read_word(p); uint16_t color555;
return decodePixel(color555); color555 = ((pgm_read_byte(p++)) << 8) | (pgm_read_byte(p));
}
protected: decodePixel(color555, &color.B, &color.R, &color.G);
static uint16_t encodePixel(ColorObject color)
{
uint16_t color555 = color.B >> 3;
color555 <<= 5;
color555 |= color.R >> 3;
color555 <<= 5;
color555 |= color.G >> 3;
color555 |= 0x8000;
return color555;
}
static ColorObject decodePixel(uint16_t color555)
{
ColorObject color;
color555 &= 0x7fff;
color.B = (color555 >> 10) & 0x1f;
color.R = (color555 >> 5) & 0x1f;
color.G = (color555) & 0x1f;
return color; return color;
} }
@@ -166,17 +171,27 @@ class Lpd6803GrbFeature : public Lpd68033Elements
public: public:
static void applyPixelColor(uint8_t* pPixels, uint16_t indexPixel, ColorObject color) static void applyPixelColor(uint8_t* pPixels, uint16_t indexPixel, ColorObject color)
{ {
uint16_t* p = reinterpret_cast<uint16_t*>(getPixelAddress(pPixels, indexPixel)); uint8_t* p = getPixelAddress(pPixels, indexPixel);
uint16_t color555;
*p = encodePixel(color); encodePixel(color.G, color.R, color.B, &color555);
*p++ = color555 >> 8;
*p = color555 & 0xff;
} }
static ColorObject retrievePixelColor(const uint8_t* pPixels, uint16_t indexPixel) static ColorObject retrievePixelColor(const uint8_t* pPixels, uint16_t indexPixel)
{ {
ColorObject color; ColorObject color;
const uint16_t* p = reinterpret_cast<const uint16_t*>(getPixelAddress(pPixels, indexPixel)); const uint8_t* p = getPixelAddress(pPixels, indexPixel);
return decodePixel(*p); uint16_t color555;
color555 = ((*p++) << 8);
color555 |= (*p);
decodePixel(color555, &color.G, &color.R, &color.B);
return color;
} }
static ColorObject retrievePixelColor_P(PGM_VOID_P pPixels, uint16_t indexPixel) static ColorObject retrievePixelColor_P(PGM_VOID_P pPixels, uint16_t indexPixel)
@@ -184,33 +199,12 @@ public:
ColorObject color; ColorObject color;
const uint8_t* p = getPixelAddress((const uint8_t*)pPixels, indexPixel); const uint8_t* p = getPixelAddress((const uint8_t*)pPixels, indexPixel);
uint16_t color555 = pgm_read_word(p); uint16_t color555;
return decodePixel(color555); color555 = ((pgm_read_byte(p++)) << 8) | (pgm_read_byte(p));
}
protected: decodePixel(color555, &color.G, &color.R, &color.B);
static uint16_t encodePixel(ColorObject color)
{
uint16_t color555 = color.G >> 3;
color555 <<= 5;
color555 |= color.R >> 3;
color555 <<= 5;
color555 |= color.B >> 3;
color555 |= 0x8000;
return color555;
}
static ColorObject decodePixel(uint16_t color555)
{
ColorObject color;
color555 &= 0x7fff;
color.G = (color555 >> 10) & 0x1f;
color.R = (color555 >> 5) & 0x1f;
color.B = (color555) & 0x1f;
return color; return color;
} }
}; };