feedc0de/TFT_eSPI
1
0
Fork 0
forked from Bodmer/TFT_eSPI
Code Pull Requests Activity

make color565() global, add TFT_NICEBLUE, make default_4bit_palette[] constexpr

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-23 19:26:51 +01:00
parent e7f06cc6ab
commit 4b13de686c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
TFT_eSPI.h
View File

@@ -258,6 +258,13 @@ const PROGMEM fontinfo fontdata [] = {
#define C_BASELINE 10 // Centre character baseline #define C_BASELINE 10 // Centre character baseline
#define R_BASELINE 11 // Right character baseline #define R_BASELINE 11 // Right character baseline
// Colour conversion
// Convert 8 bit red, green and blue to 16 bits
constexpr uint16_t color565(uint8_t red, uint8_t green, uint8_t blue) noexcept
{
return ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | (blue >> 3);
}
/*************************************************************************************** /***************************************************************************************
** Section 6: Colour enumeration ** Section 6: Colour enumeration
***************************************************************************************/ ***************************************************************************************/
@@ -287,6 +294,7 @@ constexpr uint16_t TFT_GOLD = 0xFEA0; /* 255, 215, 0 */
constexpr uint16_t TFT_SILVER = 0xC618; /* 192, 192, 192 */ constexpr uint16_t TFT_SILVER = 0xC618; /* 192, 192, 192 */
constexpr uint16_t TFT_SKYBLUE = 0x867D; /* 135, 206, 235 */ constexpr uint16_t TFT_SKYBLUE = 0x867D; /* 135, 206, 235 */
constexpr uint16_t TFT_VIOLET = 0x915C; /* 180, 46, 226 */ constexpr uint16_t TFT_VIOLET = 0x915C; /* 180, 46, 226 */
constexpr uint16_t TFT_NICEBLUE = color565(59, 163, 255);
// Next is a special 16 bit colour value that encodes to 8 bits // Next is a special 16 bit colour value that encodes to 8 bits
// and will then decode back to the same 16 bit value. // and will then decode back to the same 16 bit value.
@@ -294,7 +302,7 @@ constexpr uint16_t TFT_VIOLET = 0x915C; /* 180, 46, 226 */
#define TFT_TRANSPARENT 0x0120 // This is actually a dark green #define TFT_TRANSPARENT 0x0120 // This is actually a dark green
// Default palette for 4 bit colour sprites // Default palette for 4 bit colour sprites
static const uint16_t default_4bit_palette[] PROGMEM = { constexpr uint16_t default_4bit_palette[] {
TFT_BLACK, // 0 ^ TFT_BLACK, // 0 ^
TFT_BROWN, // 1 | TFT_BROWN, // 1 |
TFT_RED, // 2 | TFT_RED, // 2 |
@@ -625,14 +633,6 @@ class TFT_eSPI { friend class TFT_eSprite; // Sprite class has access to protect
uint16_t readcommand16(uint8_t cmd_function, uint8_t index = 0); // read 16 bits from TFT uint16_t readcommand16(uint8_t cmd_function, uint8_t index = 0); // read 16 bits from TFT
uint32_t readcommand32(uint8_t cmd_function, uint8_t index = 0); // read 32 bits from TFT uint32_t readcommand32(uint8_t cmd_function, uint8_t index = 0); // read 32 bits from TFT
// Colour conversion
// Convert 8 bit red, green and blue to 16 bits
static constexpr uint16_t color565(uint8_t red, uint8_t green, uint8_t blue) noexcept
{
return ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | (blue >> 3);
}
// Convert 8 bit colour to 16 bits // Convert 8 bit colour to 16 bits
uint16_t color8to16(uint8_t color332); uint16_t color8to16(uint8_t color332);
// Convert 16 bit colour to 8 bits // Convert 16 bit colour to 8 bits