Skip to content

Add theme-aware colour helpers to the display core #2754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vnxdtzip wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Add theme-aware colour helpers to the display core #2754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/core/display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1737,6 +1737,31 @@ uint16_t getColorVariation(uint16_t color, int delta, int direction) {
return compl_color;
}

uint16_t blendColors(uint16_t a, uint16_t b, uint8_t t) {
int ar = (a >> 11) & 0x1f, ag = (a >> 5) & 0x3f, ab = a & 0x1f;
int br = (b >> 11) & 0x1f, bg = (b >> 5) & 0x3f, bb = b & 0x1f;
int r = ar + (br - ar) * t / 255;
int g = ag + (bg - ag) * t / 255;
int bl = ab + (bb - ab) * t / 255;
return (uint16_t)((r << 11) | (g << 5) | bl);
}

void buildHeatPalette(uint16_t *lut, uint8_t n) {
if (!lut || n < 2) return;
uint16_t bg = bruceConfig.bgColor;
uint16_t pri = bruceConfig.priColor;
uint16_t hot = blendColors(pri, TFT_WHITE, 150);

lut[0] = bg;
for (uint8_t i = 1; i < n; i++) {
int t = i * 255 / (n - 1);
// ramp to the primary for the lower two thirds, then burn toward the
// highlight so strong signals stay readable against a busy plot
lut[i] = (t < 170) ? blendColors(bg, pri, 55 + t * 200 / 255)
: blendColors(pri, hot, (t - 170) * 255 / 85);
}
}

// Draw BITMAP files
// These read 16- and 32-bit types from the SD card file.
// BMP data is stored little-endian, Arduino is little-endian too.
Expand Down
6 changes: 6 additions & 0 deletions src/core/display.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,12 @@ bool showJpeg(const uint8_t *data_array, size_t data_size, int x, int y, bool ce
uint16_t getComplementaryColor(uint16_t color);
uint16_t getComplementaryColor2(uint16_t color);
uint16_t getColorVariation(uint16_t color, int delta = 10, int direction = 0);
// Linear RGB565 mix: t = 0 returns a, t = 255 returns b. Use it to derive dim
// or highlighted shades from the theme instead of hardcoding TFT_* constants.
uint16_t blendColors(uint16_t a, uint16_t b, uint8_t t);
// Fills lut[0..n-1] with a theme ramp going from the background up to a
// brightened primary, for waterfalls and other intensity plots.
void buildHeatPalette(uint16_t *lut, uint8_t n);

void resetTftDisplay(
int x = 0, int y = 0, uint16_t fc = bruceConfig.priColor, int size = FM,
Expand Down