From 429268c8d3fc240cedacf2248ac7b14a82d29e67 Mon Sep 17 00:00:00 2001 From: leo Date: Wed, 9 Aug 2023 13:05:18 +0200 Subject: [PATCH] added lv_conf to directories --- CMakeLists.txt | 1 + PSE-firmware | 2 +- main.c | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bff152..595bd6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ include_directories(${SDL2_INCLUDE_DIRS}) add_subdirectory(PSE-firmware/Drivers/lvgl) include_directories(PSE-firmware/Core/Inc) +include_directories(PSE-firmware/Drivers) add_executable(main main.c PSE-firmware/Core/Src/logo_mint_resize.c PSE-firmware/Core/Src/home_screen.c ${SOURCES} ${INCLUDES}) add_compile_definitions(LV_CONF_INCLUDE_SIMPLE) target_link_libraries(main PRIVATE lvgl ${SDL2_LIBRARIES}) diff --git a/PSE-firmware b/PSE-firmware index 2ec5147..9050633 160000 --- a/PSE-firmware +++ b/PSE-firmware @@ -1 +1 @@ -Subproject commit 2ec5147e7ddd02aacb27424df56dbfe6d16cf808 +Subproject commit 905063344eb7f67fe4ed80e8bdf1206c9fda7e6d diff --git a/main.c b/main.c index b7049ed..5ce7dd1 100644 --- a/main.c +++ b/main.c @@ -46,6 +46,9 @@ int main(int argc, char** argv){ lv_disp_drv_register(&disp_drv); lv_disp_t * disp = lv_disp_drv_register(&disp_drv); + + lv_theme_t * th = lv_theme_default_init(lv_disp_get_default(), lv_color_hex(0x00ff00), lv_color_hex(0xff0000), true, LV_FONT_DEFAULT); + lv_disp_set_theme(lv_disp_get_default(), th); lv_indev_drv_t indev_drv; lv_indev_drv_init(&indev_drv); @@ -57,8 +60,6 @@ int main(int argc, char** argv){ lv_obj_t * logo_mint = lv_img_create(lv_scr_act()); lv_img_set_src(logo_mint, &logo_mint_resize); - lv_obj_set_style_bg_color(lv_scr_act(), lv_color_hex(0x0), LV_PART_MAIN); - lv_obj_align(logo_mint, LV_ALIGN_CENTER, 0, 0); lv_obj_set_size(logo_mint, 320, 240);