From f5ec9caa88ffa0475bd1cfd78cfbb809c7f3860c Mon Sep 17 00:00:00 2001 From: mverch67 Date: Sun, 12 May 2024 16:38:37 +0200 Subject: [PATCH] fix boot screen --- generated/ui_320x240/ui.c | 4 ++-- include/LGFXDriver.h | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/generated/ui_320x240/ui.c b/generated/ui_320x240/ui.c index f3b84fb..4628827 100644 --- a/generated/ui_320x240/ui.c +++ b/generated/ui_320x240/ui.c @@ -27,9 +27,9 @@ void loadScreen(enum ScreensEnum screenId) { void ui_init() { create_screens(); - loadScreen(SCREEN_ID_MAIN_SCREEN); + loadScreen(SCREEN_ID_BOOT_SCREEN); } void ui_tick() { tick_screen(currentScreen); -} +} \ No newline at end of file diff --git a/include/LGFXDriver.h b/include/LGFXDriver.h index e03e867..46fc19f 100644 --- a/include/LGFXDriver.h +++ b/include/LGFXDriver.h @@ -34,8 +34,8 @@ template class LGFXDriver : public TFTDriver static LGFX *lgfx; size_t bufsize; - lv_color16_t *buf1; - lv_color16_t *buf2; + lv_color_t *buf1; + lv_color_t *buf2; }; template LGFX *LGFXDriver::lgfx = nullptr; @@ -87,6 +87,10 @@ template void LGFXDriver::task_handler(void) } } } +#ifdef HAS_FREE_RTOS + lv_tick_set_cb(xTaskGetTickCount); +#endif + DisplayDriver::task_handler(); } @@ -208,10 +212,10 @@ template void LGFXDriver::init(DeviceGUI *gui) lv_display_set_buffers(display, buf1, buf2, bufsize, LV_DISPLAY_RENDER_MODE_PARTIAL); #else bufsize = this->screenWidth * 10; - buf1 = new lv_color16_t[bufsize]; + buf1 = new lv_color_t[bufsize]; assert(buf1 != 0); - ILOG_DEBUG("LVGL: allocating %u bytes heap memory for draw buffer\n", sizeof(lv_color16_t) * bufsize); - lv_display_set_buffers(this->display, buf1, buf2, sizeof(lv_color16_t) * bufsize, LV_DISPLAY_RENDER_MODE_PARTIAL); + ILOG_DEBUG("LVGL: allocating %u bytes heap memory for draw buffer\n", sizeof(lv_color_t) * bufsize); + lv_display_set_buffers(this->display, buf1, buf2, sizeof(lv_color_t) * bufsize, LV_DISPLAY_RENDER_MODE_PARTIAL); #endif lv_display_set_flush_cb(this->display, LGFXDriver::display_flush);