Skip to content
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

perf: LVGL 8.3 #3279

Merged
merged 7 commits into from
Nov 7, 2023
Merged

perf: LVGL 8.3 #3279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2bcb549
chore(ui): adapt lv_conf.h for lvgl 8.3
gagarinlg Feb 28, 2023
045851f
chore(tests): Update for LVGL 8.3
pfeerick Apr 12, 2023
1c11189
chore: Rebase cleanup
pfeerick Oct 16, 2023
e3b2bb2
chore: lgvl submodule on correct branch
pfeerick Oct 20, 2023
a094aee
Rotate display from top down instead of bottom up.
Oct 21, 2023
3cad891
Fixes to work with constant styles in LVGL 8.3.
Oct 31, 2023
fc750a7
Update test images.
Oct 31, 2023
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
[submodule "radio/src/thirdparty/libopenui/thirdparty/lvgl"]
path = radio/src/thirdparty/libopenui/thirdparty/lvgl
url = https://github.com/EdgeTX/lvgl.git
branch = release/v8.2
branch = v8.3-patched
83 changes: 43 additions & 40 deletions radio/src/gui/colorlcd/themes/etx_lv_theme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,16 @@ static lv_theme_t theme;
#define LV_STYLE_CONST_SINGLE_INIT(var_name, prop, value) \
const lv_style_t var_name = {.v_p = {.value1 = {.num = value}}, \
.prop1 = prop, \
.is_const = 0, \
.has_group = 1 << ((prop & 0x1FF) >> 4), \
.prop_cnt = 1}

// Create a style with multiple properties
// Copied from lv_style.h and modified to compile with ARM GCC C++
#define LV_STYLE_CONST_MULTI_INIT(var_name, prop_array) \
const lv_style_t var_name = {.v_p = {.const_props = prop_array}, \
.prop1 = 0, \
.is_const = 1, \
.prop1 = LV_STYLE_PROP_ANY, \
.has_group = 0xFF, \
.prop_cnt = 0}
.prop_cnt = (sizeof(prop_array) / sizeof((prop_array)[0]))}

// Opacity
LV_STYLE_CONST_SINGLE_INIT(bg_opacity_transparent, LV_STYLE_BG_OPA,
Expand Down Expand Up @@ -286,33 +284,41 @@ class EdgeTxStyles
lv_style_t font_std;
lv_style_t font_bold;

EdgeTxStyles()
EdgeTxStyles() {}

void init()
{
// Colors
for (int i = DEFAULT_COLOR_INDEX; i < LCD_COLOR_COUNT; i += 1) {
lv_style_init(&bg_color[i]);
lv_style_init(&txt_color[i]);
if (!initDone) {
initDone = true;

// Colors
for (int i = DEFAULT_COLOR_INDEX; i < LCD_COLOR_COUNT; i += 1) {
lv_style_init(&bg_color[i]);
lv_style_init(&txt_color[i]);
}
lv_style_init(&border_color_secondary1);
lv_style_init(&border_color_secondary2);
lv_style_init(&border_color_focus);

lv_style_init(&bg_color_grey);
lv_style_set_bg_color(&bg_color_grey, lv_palette_main(LV_PALETTE_GREY));
lv_style_init(&bg_color_white);
lv_style_set_bg_color(&bg_color_white, lv_color_white());
lv_style_init(&bg_color_black);
lv_style_set_bg_color(&bg_color_black, lv_color_black());
lv_style_init(&fg_color_black);
lv_style_set_text_color(&fg_color_black, lv_color_black());
lv_style_init(&border_color_black);
lv_style_set_border_color(&border_color_black, lv_color_black());

// Fonts
lv_style_init(&font_std);
lv_style_set_text_font(&font_std, getFont(FONT(STD)));
lv_style_init(&font_bold);
lv_style_set_text_font(&font_bold, getFont(FONT(BOLD)));

applyColors();
}
lv_style_init(&border_color_secondary1);
lv_style_init(&border_color_secondary2);
lv_style_init(&border_color_focus);

lv_style_init(&bg_color_grey);
lv_style_set_bg_color(&bg_color_grey, lv_palette_main(LV_PALETTE_GREY));
lv_style_init(&bg_color_white);
lv_style_set_bg_color(&bg_color_white, lv_color_white());
lv_style_init(&bg_color_black);
lv_style_set_bg_color(&bg_color_black, lv_color_black());
lv_style_init(&fg_color_black);
lv_style_set_text_color(&fg_color_black, lv_color_black());
lv_style_init(&border_color_black);
lv_style_set_border_color(&border_color_black, lv_color_black());

// Fonts
lv_style_init(&font_std);
lv_style_set_text_font(&font_std, getFont(FONT(STD)));
lv_style_init(&font_bold);
lv_style_set_text_font(&font_bold, getFont(FONT(BOLD)));
}

void applyColors()
Expand All @@ -334,11 +340,12 @@ class EdgeTxStyles
}

protected:
bool initDone = false;
};

static EdgeTxStyles* styles;
static EdgeTxStyles mainStyles;
static EdgeTxStyles* previewStyles;
static EdgeTxStyles* mainStyles;
static EdgeTxStyles* styles = &mainStyles;

/**********************
* GLOBAL FUNCTIONS
Expand All @@ -355,11 +362,7 @@ lv_theme_t* etx_lv_theme_init(lv_disp_t* disp, lv_color_t color_primary,
theme.font_large = font;
theme.flags = 0;

if (!styles) {
styles = new EdgeTxStyles();
mainStyles = styles;
}
styles->applyColors();
styles->init();

if (disp == NULL || lv_disp_get_theme(disp) == &theme)
lv_obj_report_style_change(NULL);
Expand All @@ -374,7 +377,7 @@ void usePreviewStyle()
styles->applyColors();
}

void useMainStyle() { styles = mainStyles; }
void useMainStyle() { styles = &mainStyles; }

/**********************
* Custom object creation
Expand Down Expand Up @@ -569,8 +572,7 @@ void etx_switch_constructor(const lv_obj_class_t* class_p, lv_obj_t* obj)

void etx_slider_constructor(const lv_obj_class_t* class_p, lv_obj_t* obj)
{
etx_add_colors_and_opacity(obj, LV_PART_MAIN,
COLOR_THEME_SECONDARY1_INDEX,
etx_add_colors_and_opacity(obj, LV_PART_MAIN, COLOR_THEME_SECONDARY1_INDEX,
COLOR_THEME_PRIMARY2_INDEX);
lv_obj_add_style(obj, (lv_style_t*)&circle, LV_PART_MAIN);
lv_obj_add_style(obj, &styles->bg_color[COLOR_THEME_FOCUS_INDEX],
Expand All @@ -586,7 +588,8 @@ void etx_slider_constructor(const lv_obj_class_t* class_p, lv_obj_t* obj)
lv_obj_add_style(obj, (lv_style_t*)&bg_opacity_cover, LV_PART_KNOB);
lv_obj_add_style(obj, (lv_style_t*)&slider_knob, LV_PART_KNOB);
lv_obj_add_style(obj, &styles->border_color_secondary1, LV_PART_KNOB);
lv_obj_add_style(obj, &styles->border_color_focus, LV_PART_KNOB | LV_STATE_FOCUSED);
lv_obj_add_style(obj, &styles->border_color_focus,
LV_PART_KNOB | LV_STATE_FOCUSED);
}

void etx_btnmatrix_constructor(const lv_obj_class_t* class_p, lv_obj_t* obj)
Expand Down
Loading