From 53d765bbd8ee2e73d9be0a18ef5590b6077458df Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Sat, 11 Jun 2022 22:24:50 +0200 Subject: [PATCH] Update LittleVgl with upstream changes --- sim/displayapp/LittleVgl.cpp | 284 +++++++++++------------------------ sim/displayapp/LittleVgl.h | 33 ++-- 2 files changed, 108 insertions(+), 209 deletions(-) diff --git a/sim/displayapp/LittleVgl.cpp b/sim/displayapp/LittleVgl.cpp index 9172fdd..a244f84 100644 --- a/sim/displayapp/LittleVgl.cpp +++ b/sim/displayapp/LittleVgl.cpp @@ -1,57 +1,67 @@ #include "displayapp/LittleVgl.h" #include "displayapp/lv_pinetime_theme.h" -//#include -//#include +#include +#include ////#include #include "drivers/Cst816s.h" #include "drivers/St7789.h" using namespace Pinetime::Components; -//lv_style_t* LabelBigStyle = nullptr; -// -//static void disp_flush(lv_disp_drv_t* disp_drv, const lv_area_t* area, lv_color_t* color_p) { -// auto* lvgl = static_cast(disp_drv->user_data); -// lvgl->FlushDisplay(area, color_p); -//} -// +lv_style_t* LabelBigStyle = nullptr; + +static void disp_flush(lv_disp_drv_t* disp_drv, const lv_area_t* area, lv_color_t* color_p) { + auto* lvgl = static_cast(disp_drv->user_data); + lvgl->FlushDisplay(area, color_p); +} + +static void rounder(lv_disp_drv_t* disp_drv, lv_area_t* area) { + auto* lvgl = static_cast(disp_drv->user_data); + if (lvgl->GetFullRefresh()) { + area->x1 = 0; + area->x2 = LV_HOR_RES - 1; + area->y1 = 0; + area->y2 = LV_VER_RES - 1; + } +} + bool touchpad_read(lv_indev_drv_t* indev_drv, lv_indev_data_t* data) { auto* lvgl = static_cast(indev_drv->user_data); return lvgl->GetTouchPadInfo(data); } LittleVgl::LittleVgl(Pinetime::Drivers::St7789& lcd, Pinetime::Drivers::Cst816S& touchPanel) - : lcd {lcd}, touchPanel {touchPanel}, previousClick {0, 0} { - + : lcd {lcd}, touchPanel {touchPanel} { } void LittleVgl::Init() { // lv_init(); -// InitDisplay(); // InitTheme(); +// InitDisplay(); InitTouchpad(); } -//void LittleVgl::InitDisplay() { -// lv_disp_draw_buf_init(&disp_buf_2, buf2_1, buf2_2, LV_HOR_RES_MAX * 4); /*Initialize the display buffer*/ -// lv_disp_drv_init(&disp_drv); /*Basic initialization*/ -// -// /*Set up the functions to access to your display*/ -// -// /*Set the resolution of the display*/ -// disp_drv.hor_res = 240; -// disp_drv.ver_res = 240; -// -// /*Used to copy the buffer's content to the display*/ -// disp_drv.flush_cb = disp_flush; -// /*Set a display buffer*/ -// disp_drv.draw_buf = &disp_buf_2; -// disp_drv.user_data = this; -// -// /*Finally register the driver*/ -// lv_disp_drv_register(&disp_drv); -//} +void LittleVgl::InitDisplay() { + lv_disp_buf_init(&disp_buf_2, buf2_1, buf2_2, LV_HOR_RES_MAX * 4); /*Initialize the display buffer*/ + lv_disp_drv_init(&disp_drv); /*Basic initialization*/ + + /*Set up the functions to access to your display*/ + + /*Set the resolution of the display*/ + disp_drv.hor_res = 240; + disp_drv.ver_res = 240; + + /*Used to copy the buffer's content to the display*/ + disp_drv.flush_cb = disp_flush; + /*Set a display buffer*/ + disp_drv.buffer = &disp_buf_2; + disp_drv.user_data = this; + disp_drv.rounder_cb = rounder; + + /*Finally register the driver*/ + lv_disp_drv_register(&disp_drv); +} void LittleVgl::InitTouchpad() { lv_indev_drv_t indev_drv; @@ -67,171 +77,30 @@ void LittleVgl::SetFullRefresh(FullRefreshDirections direction) { if (scrollDirection == FullRefreshDirections::None) { scrollDirection = direction; if (scrollDirection == FullRefreshDirections::Down) { - lv_disp_set_rotation(lv_disp_get_default(), LV_DISP_ROT_NONE); + lv_disp_set_direction(lv_disp_get_default(), 1); } else if (scrollDirection == FullRefreshDirections::Right) { - lv_disp_set_rotation(lv_disp_get_default(), LV_DISP_ROT_NONE); + lv_disp_set_direction(lv_disp_get_default(), 2); } else if (scrollDirection == FullRefreshDirections::Left) { - lv_disp_set_rotation(lv_disp_get_default(), LV_DISP_ROT_NONE); + lv_disp_set_direction(lv_disp_get_default(), 3); } else if (scrollDirection == FullRefreshDirections::RightAnim) { - lv_disp_set_rotation(lv_disp_get_default(), LV_DISP_ROT_NONE); + lv_disp_set_direction(lv_disp_get_default(), 5); } else if (scrollDirection == FullRefreshDirections::LeftAnim) { - lv_disp_set_rotation(lv_disp_get_default(), LV_DISP_ROT_NONE); + lv_disp_set_direction(lv_disp_get_default(), 4); } } + fullRefresh = true; } -// -// -//void LittleVgl::DisplayDownScroll(){ -// // We are controlling the drawing process, disable lvgl timers -// lv_timer_enable(false); -// -// // For each segment, draw the full width, 4 lines at a time starting from the bottom -// // TODO: Should probably calculate this from the size of the draw buffer -// int16_t height = 4; -// int16_t width = 240; -// int16_t y2 = 240; -// int16_t y1 = 240 - height; -// -// lv_area_t area; -// area.x1 = 0; -// area.x2 = width; -// -// // Start from the bottom and create a 4 line high box -// for (y1 = 240 - height; y1 >= 0; y1 -= height) { -// y2 = y1 + height - 1; -// -// // If the box has reached the end of the visible line on the lcd controller... -// if (y2 == visibleNbLines - 1) { -// // move past the non visible lines -// writeOffset += (totalNbLines - visibleNbLines); -// // and wrap around to the start of address space -// writeOffset %= totalNbLines; -// } -// // Set new box -// area.y1 = y1; -// area.y2 = y2; -// -// // Scroll as we draw -// uint16_t toScroll = height; -// if (scrollOffset >= toScroll) -// scrollOffset -= toScroll; -// else { // now we need to wrap the scroll address -// toScroll -= scrollOffset; -// scrollOffset = totalNbLines - toScroll; -// } -// lcd.VerticalScrollStartAddress(scrollOffset); -// -// lv_disp_t* disp = lv_disp_get_default(); -// // Clear invalid area list / tells lvgl that nothing on the screen needs to be updated -// _lv_inv_area(disp, nullptr); -// // invalidate only the segment we want to update in this portion of the animation -// _lv_inv_area(disp, &area); -// // cancel any current flushes in the display driver -// // Since we've stopped timers, it will be waiting forever if there is currently a flush -// lv_disp_flush_ready(disp->driver); -// lv_refr_now(disp); -// } -// // Done! clear flags and enable timers -// scrollDirection = FullRefreshDirections::None; -// animating = false; -// lv_timer_enable(true); -//} -// -//void LittleVgl::DisplayHorizAnim() { -// lv_timer_enable(false); -// -// int16_t height, width, x1, x2; -// lv_area_t area; -// -// height = 240; -// width = 4; -// int16_t (*NextStep)(int16_t, int16_t){}; -// bool (*CheckEnd)(int16_t){}; -// -// area.y1=0; -// area.y2=height; -// -// if (scrollDirection == FullRefreshDirections::RightAnim) { -// x1 = 0; -// -// CheckEnd = [](int16_t x) -> bool { -// return (x < LV_HOR_RES_MAX); -// }; -// NextStep = [](int16_t x, int16_t width) -> int16_t { -// auto newx = x + width * 2; -// if (newx < 240) {return newx;}; -// return (newx < 240 + width) ? (newx - 240 + width) : newx; -// }; -// -// } else if (scrollDirection == FullRefreshDirections::LeftAnim) { -// x1 = 240 - width; -// -// CheckEnd = [](int16_t x) -> bool { -// return (x >= 0); -// }; -// NextStep = [](int16_t x, int16_t width) -> int16_t { -// auto newx = x - width * 2; -// if (newx >= 0) {return newx;} -// return (newx >= 0 - width) ? (newx + 240 - width) : newx; -// }; -// -// } else { -// // Not set for a horizontal animation! -// lv_timer_enable(true); -// return; -// } -// -// for (; CheckEnd(x1); x1 = NextStep(x1, width)) { -// x2 = x1 + width-1; -// -// if (area.y2 == visibleNbLines - 1) { -// writeOffset += (totalNbLines - visibleNbLines); -// writeOffset %= totalNbLines; -// } -// area.x1 = x1; -// area.x2 = x2; -// -// lv_disp_t* disp = lv_disp_get_default(); -// _lv_inv_area(disp, nullptr); -// _lv_inv_area(disp, &area); -// lv_disp_flush_ready(disp->driver); -// lv_refr_now(disp); -// } -// scrollDirection = FullRefreshDirections::None; -// animating = false; -// lv_timer_enable(true); -//} -// -//void LittleVgl::FlushDisplayManually() { -// switch(scrollDirection){ -// case FullRefreshDirections::Down: -// DisplayDownScroll(); -// break; -// case FullRefreshDirections::RightAnim: -// case FullRefreshDirections::LeftAnim: -// DisplayHorizAnim(); -// break; -// default: -// break; -// } -//} -// + void LittleVgl::FlushDisplay(const lv_area_t* area, lv_color_t* color_p) { // uint16_t y1, y2, width, height = 0; // // ulTaskNotifyTake(pdTRUE, 200); -// // NOtification is still needed (even if there is a mutex on SPI) because of the DataCommand pin -// // which cannot be set/clear during a transfert. -// -// if (!animating && (scrollDirection == FullRefreshDirections::Down || -// scrollDirection == FullRefreshDirections::RightAnim || -// scrollDirection == FullRefreshDirections::LeftAnim)){ -// animating = true; -// FlushDisplayManually(); -// return; -// } +// // Notification is still needed (even if there is a mutex on SPI) because of the DataCommand pin +// // which cannot be set/clear during a transfer. // -// if ((scrollDirection == FullRefreshDirections::Up) && (area->y1 == 0)) { +// if ((scrollDirection == LittleVgl::FullRefreshDirections::Down) && (area->y2 == visibleNbLines - 1)) { +// writeOffset = ((writeOffset + totalNbLines) - visibleNbLines) % totalNbLines; +// } else if ((scrollDirection == FullRefreshDirections::Up) && (area->y1 == 0)) { // writeOffset = (writeOffset + visibleNbLines) % totalNbLines; // } // @@ -241,13 +110,34 @@ void LittleVgl::FlushDisplay(const lv_area_t* area, lv_color_t* color_p) { // width = (area->x2 - area->x1) + 1; // height = (area->y2 - area->y1) + 1; // -// if (scrollDirection == FullRefreshDirections::Up) { +// if (scrollDirection == LittleVgl::FullRefreshDirections::Down) { +// +// if (area->y2 < visibleNbLines - 1) { +// uint16_t toScroll = 0; +// if (area->y1 == 0) { +// toScroll = height * 2; +// scrollDirection = FullRefreshDirections::None; +// lv_disp_set_direction(lv_disp_get_default(), 0); +// } else { +// toScroll = height; +// } +// +// if (scrollOffset >= toScroll) +// scrollOffset -= toScroll; +// else { +// toScroll -= scrollOffset; +// scrollOffset = (totalNbLines) -toScroll; +// } +// lcd.VerticalScrollStartAddress(scrollOffset); +// } +// +// } else if (scrollDirection == FullRefreshDirections::Up) { // // if (area->y1 > 0) { // if (area->y2 == visibleNbLines - 1) { // scrollOffset += (height * 2); // scrollDirection = FullRefreshDirections::None; -//// lv_disp_set_rotation(lv_disp_get_default(), LV_DISP_ROT_NONE); +// lv_disp_set_direction(lv_disp_get_default(), 0); // } else { // scrollOffset += height; // } @@ -257,12 +147,12 @@ void LittleVgl::FlushDisplay(const lv_area_t* area, lv_color_t* color_p) { // } else if (scrollDirection == FullRefreshDirections::Left or scrollDirection == FullRefreshDirections::LeftAnim) { // if (area->x2 == visibleNbLines - 1) { // scrollDirection = FullRefreshDirections::None; -//// lv_disp_set_rotation(lv_disp_get_default(), LV_DISP_ROT_NONE); +// lv_disp_set_direction(lv_disp_get_default(), 0); // } // } else if (scrollDirection == FullRefreshDirections::Right or scrollDirection == FullRefreshDirections::RightAnim) { // if (area->x1 == 0) { // scrollDirection = FullRefreshDirections::None; -//// lv_disp_set_rotation(lv_disp_get_default(), LV_DISP_ROT_NONE); +// lv_disp_set_direction(lv_disp_get_default(), 0); // } // } // @@ -319,9 +209,15 @@ bool LittleVgl::GetTouchPadInfo(lv_indev_data_t* ptr) { return false; } -//void LittleVgl::InitTheme() { -// if (!lv_pinetime_theme_is_inited()) { -// lv_theme_t* th = lv_pinetime_theme_init(lv_disp_get_default(), lv_color_white(), lv_color_hex(0xC0C0C0), &jetbrains_mono_bold_20); -// lv_disp_set_theme(lv_disp_get_default(), th); -// } -//} +void LittleVgl::InitTheme() { + + lv_theme_t* th = lv_pinetime_theme_init(LV_COLOR_WHITE, + LV_COLOR_SILVER, + 0, + &jetbrains_mono_bold_20, + &jetbrains_mono_bold_20, + &jetbrains_mono_bold_20, + &jetbrains_mono_bold_20); + + lv_theme_set_act(th); +} diff --git a/sim/displayapp/LittleVgl.h b/sim/displayapp/LittleVgl.h index db47881..4582616 100644 --- a/sim/displayapp/LittleVgl.h +++ b/sim/displayapp/LittleVgl.h @@ -25,27 +25,30 @@ namespace Pinetime { bool GetTouchPadInfo(lv_indev_data_t* ptr); void SetFullRefresh(FullRefreshDirections direction); void SetNewTouchPoint(uint16_t x, uint16_t y, bool contact); -// -// private: -// void InitDisplay(); + + bool GetFullRefresh() { + bool returnValue = fullRefresh; + if (fullRefresh) { + fullRefresh = false; + } + return returnValue; + } + + private: + void InitDisplay(); void InitTouchpad(); -// void InitTheme(); -// -// void FlushDisplayManually(); -// void DisplayDownScroll(); -// void DisplayHorizAnim(); + void InitTheme(); Pinetime::Drivers::St7789& lcd; Pinetime::Drivers::Cst816S& touchPanel; -// lv_disp_draw_buf_t disp_buf_2; -// lv_color_t buf2_1[LV_HOR_RES_MAX * 4]; -// lv_color_t buf2_2[LV_HOR_RES_MAX * 4]; -// - lv_disp_drv_t disp_drv; - lv_point_t previousClick; + lv_disp_buf_t disp_buf_2; + lv_color_t buf2_1[LV_HOR_RES_MAX * 4]; + lv_color_t buf2_2[LV_HOR_RES_MAX * 4]; - bool firstTouch = true; + lv_disp_drv_t disp_drv; + + bool fullRefresh = false; static constexpr uint8_t nbWriteLines = 4; static constexpr uint16_t totalNbLines = 320; static constexpr uint16_t visibleNbLines = 240;