diff --git a/lv_sim_linux/GUI/PageManager.c b/lv_sim_linux/GUI/PageManager.c index 28244b5..c16f8d1 100644 --- a/lv_sim_linux/GUI/PageManager.c +++ b/lv_sim_linux/GUI/PageManager.c @@ -1,4 +1,4 @@ -#include "PageManager.h" +#include "./PageManager.h" #include // 定义全局实例 diff --git a/lv_sim_linux/GUI/ui.c b/lv_sim_linux/GUI/ui.c index 167fc90..a89ae85 100644 --- a/lv_sim_linux/GUI/ui.c +++ b/lv_sim_linux/GUI/ui.c @@ -1,7 +1,7 @@ // LVGL version: 9.2 // Project name: PowerPico -#include "ui.h" +#include "./ui.h" ///////////////////// VARIABLES //////////////////// @@ -9,7 +9,7 @@ ///////////////////// TEST LVGL SETTINGS //////////////////// -#if LV_COLOR_DEPTH != 16 +#if LV_COLOR_DEPTH != 32 #error "LV_COLOR_DEPTH should be 16bit to match SquareLine Studio's settings" #endif @@ -19,8 +19,7 @@ */ static void main_timer(lv_timer_t * timer) { - // printf("timer\r\n"); - + LV_LOG_INFO("Main timer"); } /////////////////////// ui_initialize ////////////////////// diff --git a/lv_sim_linux/GUI/ui.h b/lv_sim_linux/GUI/ui.h index 4a4e708..1ee101a 100644 --- a/lv_sim_linux/GUI/ui.h +++ b/lv_sim_linux/GUI/ui.h @@ -1,4 +1,4 @@ -// LVGL VERSION: 8.2.0 +// LVGL VERSION: 9.2 #ifndef _UI_H diff --git a/lv_sim_linux/main.c b/lv_sim_linux/main.c index d077a44..aa43770 100644 --- a/lv_sim_linux/main.c +++ b/lv_sim_linux/main.c @@ -30,8 +30,8 @@ static void lv_linux_disp_init(void) #elif LV_USE_SDL static void lv_linux_disp_init(void) { - const int width = atoi(getenv("LV_SDL_VIDEO_WIDTH") ? : "800"); - const int height = atoi(getenv("LV_SDL_VIDEO_HEIGHT") ? : "480"); + const int width = atoi(getenv("LV_SDL_VIDEO_WIDTH") ? : "240"); + const int height = atoi(getenv("LV_SDL_VIDEO_HEIGHT") ? : "240"); lv_sdl_window_create(width, height); } @@ -45,6 +45,8 @@ static void lv_linux_indev_init(void) #error Unsupported configuration #endif +#include "./GUI/ui.h" + int main(void) { lv_init(); @@ -55,9 +57,11 @@ int main(void) lv_linux_indev_init(); /*Create a Demo*/ - lv_demo_widgets(); + // lv_demo_widgets(); // lv_demo_widgets_start_slideshow(); + ui_init(); + /*Handle LVGL tasks*/ while(1) { lv_timer_handler();