Keith Bennett
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
9 additions and
7 deletions
-
Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
-
Marlin/src/lcd/tft/tft_color.h
|
|
|
@ -83,7 +83,8 @@ TFT_IO tftio; |
|
|
|
#define X_HI (UPSCALE(TFT_PIXEL_OFFSET_X, WIDTH) - 1) |
|
|
|
#define Y_HI (UPSCALE(TFT_PIXEL_OFFSET_Y, HEIGHT) - 1) |
|
|
|
|
|
|
|
// see https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html
|
|
|
|
// 16 bit color generator: https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html
|
|
|
|
// RGB565 color picker: https://trolsoft.ru/en/articles/rgb565-color-picker
|
|
|
|
|
|
|
|
#define COLOR_BLACK 0x0000 // #000000
|
|
|
|
#define COLOR_WHITE 0xFFFF // #FFFFFF
|
|
|
|
@ -91,7 +92,7 @@ TFT_IO tftio; |
|
|
|
#define COLOR_GREY 0x7BEF // #808080
|
|
|
|
#define COLOR_DARKGREY 0x4208 // #404040
|
|
|
|
#define COLOR_DARKGREY2 0x39E7 // #303030
|
|
|
|
#define COLOR_DARK 0x0003 // Some dark color
|
|
|
|
#define COLOR_DARK 0x0003 // #000019
|
|
|
|
|
|
|
|
#define COLOR_RED 0xF800 // #FF0000
|
|
|
|
#define COLOR_LIME 0x7E00 // #00FF00
|
|
|
|
|
|
|
|
@ -30,7 +30,8 @@ |
|
|
|
#define COLOR(color) RGB(((color >> 16) & 0xFF), ((color >> 8) & 0xFF), (color & 0xFF)) |
|
|
|
#define HALF(color) RGB(RED(color) >> 1, GREEN(color) >> 1, BLUE(color) >> 1) |
|
|
|
|
|
|
|
// see https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html
|
|
|
|
// 16 bit color generator: https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html
|
|
|
|
// RGB565 color picker: https://trolsoft.ru/en/articles/rgb565-color-picker
|
|
|
|
|
|
|
|
#define COLOR_BLACK 0x0000 // #000000
|
|
|
|
#define COLOR_WHITE 0xFFFF // #FFFFFF
|
|
|
|
@ -38,7 +39,7 @@ |
|
|
|
#define COLOR_GREY 0x7BEF // #808080
|
|
|
|
#define COLOR_DARKGREY 0x4208 // #404040
|
|
|
|
#define COLOR_DARKGREY2 0x39E7 // #303030
|
|
|
|
#define COLOR_DARK 0x0003 // Some dark color
|
|
|
|
#define COLOR_DARK 0x0003 // #000019
|
|
|
|
|
|
|
|
#define COLOR_RED 0xF800 // #FF0000
|
|
|
|
#define COLOR_SCARLET 0xF904 // #FF2020
|
|
|
|
@ -76,7 +77,7 @@ |
|
|
|
#define COLOR_SELECTION_BG 0x9930 // #992380
|
|
|
|
#endif |
|
|
|
#ifndef COLOR_WEBSITE_URL |
|
|
|
#define COLOR_WEBSITE_URL 0x03B7 |
|
|
|
#define COLOR_WEBSITE_URL 0x03B7 // #0075BD
|
|
|
|
#endif |
|
|
|
|
|
|
|
#ifndef COLOR_INACTIVE |
|
|
|
|
