Skip to content

Commit aace0cc

Browse files
Updated LVGL version. Fixed race condition in the gs_platform_layer.cpp
1 parent e6474d4 commit aace0cc

File tree

9 files changed

+1125
-720
lines changed

9 files changed

+1125
-720
lines changed

Firmware/.gitignore renamed to .gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
.idea
1212
cmake-build-debug
1313
build-Firmware-ARM_Toolchain-Debug
14+
build-Firmware-Desktop_Qt_5_15_2_GCC_64bit-Debug
1415
test/build
1516
out
1617

Firmware/graphics/gs_lvgl_service.cpp

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -71,35 +71,8 @@ class LvglGraphicsService::GSLvglServiceImpl
7171
private:
7272
void initLvglLogger() noexcept
7373
{
74-
auto lvglLoggerCallback = cbc::obtain_connector([](lv_log_level_t level,
75-
const char* file,
76-
std::uint32_t line,
77-
const char* functionName,
78-
const char* dsc) {
79-
switch (level)
80-
{
81-
case LV_LOG_LEVEL_ERROR:
82-
LOG_DEBUG("[ERROR]:");
83-
break;
84-
case LV_LOG_LEVEL_WARN:
85-
LOG_DEBUG("[WARNING]:");
86-
break;
87-
case LV_LOG_LEVEL_INFO:
88-
LOG_DEBUG("[INFO]:");
89-
break;
90-
case LV_LOG_LEVEL_TRACE:
91-
LOG_DEBUG("[TRACE]:");
92-
break;
93-
94-
default:
95-
LOG_DEBUG("[LVGL_LOG]:");
96-
}
97-
LOG_DEBUG("File:");
98-
LOG_DEBUG(file);
99-
LOG_DEBUG(":");
100-
LOG_DEBUG(":functon");
101-
LOG_DEBUG(functionName);
102-
LOG_DEBUG_ENDL(dsc);
74+
auto lvglLoggerCallback = cbc::obtain_connector([](const char* loggerMessage) {
75+
LOG_DEBUG_ENDL(loggerMessage);
10376
});
10477
#if LV_USE_LOG == 1
10578
lv_log_register_print_cb(lvglLoggerCallback);

Firmware/graphics/lvgl_lib/lvgl_driver_backend/CMakeLists.txt

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,27 @@ target_include_directories(
1818
)
1919

2020
set ( TARGET_SOURCE_LIST
21+
"lv_drivers/display/ILI9341.c"
22+
"lv_drivers/display/UC1610.c"
23+
"lv_drivers/display/GC9A01.c"
24+
"lv_drivers/display/SSD1963.c"
2125
"lv_drivers/display/drm.c"
2226
"lv_drivers/display/fbdev.c"
23-
"lv_drivers/display/GC9A01.c"
24-
"lv_drivers/display/ILI9341.c"
25-
"lv_drivers/display/monitor.c"
26-
"lv_drivers/display/R61581.c"
2727
"lv_drivers/display/SHARP_MIP.c"
28-
"lv_drivers/display/SSD1963.c"
2928
"lv_drivers/display/ST7565.c"
30-
"lv_drivers/display/UC1610.c"
31-
"lv_drivers/gtkdrv/gtkdrv.c"
32-
"lv_drivers/indev/AD_touch.c"
33-
"lv_drivers/indev/evdev.c"
29+
"lv_drivers/display/R61581.c"
30+
"lv_drivers/indev/XPT2046.c"
3431
"lv_drivers/indev/FT5406EE8.c"
35-
"lv_drivers/indev/keyboard.c"
32+
"lv_drivers/indev/evdev.c"
33+
"lv_drivers/indev/xkb.c"
3634
"lv_drivers/indev/libinput.c"
37-
"lv_drivers/indev/mouse.c"
38-
"lv_drivers/indev/mousewheel.c"
39-
"lv_drivers/indev/XPT2046.c"
35+
"lv_drivers/indev/AD_touch.c"
36+
"lv_drivers/win_drv.c"
4037
"lv_drivers/wayland/wayland.c"
38+
"lv_drivers/gtkdrv/gtkdrv.c"
39+
"lv_drivers/sdl/sdl_gpu.c"
40+
"lv_drivers/sdl/sdl.c"
4141
"lv_drivers/win32drv/win32drv.c"
42-
"lv_drivers/win_drv.c"
4342
)
4443
target_sources(
4544
${TARGET_NAME}

0 commit comments

Comments
 (0)