diff --git a/radio/src/thirdparty/libopenui/src/libopenui_defines.h b/radio/src/thirdparty/libopenui/src/libopenui_defines.h index 74b0c54d2..dcf43c14b 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_defines.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_defines.h @@ -83,5 +83,4 @@ #define COLOR2FLAGS(color) LcdFlags(unsigned(color) << 16u) #define COLOR_VAL(flags) ((flags) >> 16u) #define COLOR_MASK(flags) ((flags) & 0xFFFF0000u) -#define COLOR(index) (lcdColorTable[ unsigned(index) & 0xFF ] << 16u) diff --git a/radio/src/thirdparty/libopenui/src/libopenui_depends.h b/radio/src/thirdparty/libopenui/src/libopenui_depends.h index df319d028..ebcc2c3ae 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_depends.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_depends.h @@ -30,3 +30,25 @@ void onKeyError(); void killEvents(event_t event); event_t getWindowEvent(); +// +// These colors MUST be defined +// + +// #define DEFAULT_COLOR +// #define DEFAULT_BGCOLOR +// #define FOCUS_COLOR +// #define FOCUS_BGCOLOR +// #define DISABLE_COLOR +// #define HIGHLIGHT_COLOR +// #define CHECKBOX_COLOR +// #define SCROLLBAR_COLOR +// #define MENU_COLOR +// #define MENU_BGCOLOR +// #define MENU_TITLE_BGCOLOR +// #define MENU_LINE_COLOR +// #define MENU_HIGHLIGHT_COLOR +// #define MENU_HIGHLIGHT_BGCOLOR +// #define OVERLAY_COLOR +// #define TABLE_BGCOLOR +// #define TABLE_HEADER_BGCOLOR +// #define CUSTOM_COLOR diff --git a/radio/src/thirdparty/libopenui/src/libopenui_globals.h b/radio/src/thirdparty/libopenui/src/libopenui_globals.h index 27d5b92a9..20a3e74e3 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_globals.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_globals.h @@ -22,12 +22,6 @@ #include #include "libopenui_config.h" -extern uint16_t lcdColorTable[LCD_COLOR_COUNT]; extern const uint16_t * const fontspecsTable[FONTS_COUNT]; extern const uint8_t * fontsTable[FONTS_COUNT]; -inline void lcdSetColor(uint16_t color) -{ - lcdColorTable[CUSTOM_COLOR_INDEX] = color; -} -