Skip to content

Commit

Permalink
Merge pull request #20846 from fzi-haxel/pr/lvgl-native64
Browse files Browse the repository at this point in the history
pkg/lvgl: Increase default LV_MEM_SIZE for 64 bit and enable tests for native64
  • Loading branch information
benpicco authored Aug 30, 2024
2 parents 481b580 + 6ef1976 commit f2076ad
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
21 changes: 14 additions & 7 deletions pkg/lvgl/include/lv_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,20 @@ extern "C" {
#define LV_MEM_CUSTOM 0
#if LV_MEM_CUSTOM == 0
/*Size of the memory available for `lv_mem_alloc()` in bytes (>= 2kB)*/
#if IS_USED(MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW)
# ifndef LV_MEM_SIZE
# define LV_MEM_SIZE (6U * 1024U) /*[bytes]*/
# endif
#else
# ifndef LV_MEM_SIZE
# define LV_MEM_SIZE (5U * 1024U) /*[bytes]*/
#ifndef LV_MEM_SIZE
# if (__SIZEOF_POINTER__ > 4)
/*64-bit platforms require additional space because a lot of pointers are stored on the lvgl heap.*/
# if IS_USED(MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW)
# define LV_MEM_SIZE (9U * 1024U) /*[bytes]*/
# else
# define LV_MEM_SIZE (8U * 1024U) /*[bytes]*/
# endif
# else
# if IS_USED(MODULE_LVGL_EXTRA_THEME_DEFAULT_GROW)
# define LV_MEM_SIZE (6U * 1024U) /*[bytes]*/
# else
# define LV_MEM_SIZE (5U * 1024U) /*[bytes]*/
# endif
# endif
#endif

Expand Down
3 changes: 0 additions & 3 deletions tests/pkg/lvgl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ USEMODULE += lvgl_extra_layout_flex
USEMODULE += lvgl_extra_theme_default
USEMODULE += lvgl_extra_theme_default_dark

# blacklist native64 until https://github.com/RIOT-OS/riotdocker/pull/241 is resolved
BOARD_BLACKLIST += native64

include $(RIOTBASE)/Makefile.include

# SDL requires more stack
Expand Down
3 changes: 0 additions & 3 deletions tests/pkg/lvgl_touch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ USEMODULE += lvgl_extra_theme_default

USEMODULE += random

# blacklist native64 until https://github.com/RIOT-OS/riotdocker/pull/241 is resolved
BOARD_BLACKLIST += native64

include $(RIOTBASE)/Makefile.include

# SDL requires more stack
Expand Down

0 comments on commit f2076ad

Please sign in to comment.