From 479e8ad2441822918aa15f93621dd7f186508d9c Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 15 Jun 2022 10:50:29 +0200 Subject: [PATCH] Fix direct drawing for special cases --- radio/src/gui/colorlcd/lcd.cpp | 52 ++++++++++++++++++++++++++++++++-- radio/src/main.cpp | 2 +- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/colorlcd/lcd.cpp b/radio/src/gui/colorlcd/lcd.cpp index ee063a9c2..9b8a6fdfb 100644 --- a/radio/src/gui/colorlcd/lcd.cpp +++ b/radio/src/gui/colorlcd/lcd.cpp @@ -192,10 +192,58 @@ void lcdInitDirectDrawing() lcd->setData((pixel_t*)draw_ctx->buf); } +// +// Private code copied and adapted from LVGL / lv_refr.c +// (_call_flush_cb & _draw_buf_flush) +// +static void _call_flush_cb(lv_disp_drv_t* drv, const lv_area_t* area, + lv_color_t* color_p) +{ + lv_area_t offset_area = {.x1 = (lv_coord_t)(area->x1 + drv->offset_x), + .y1 = (lv_coord_t)(area->y1 + drv->offset_y), + .x2 = (lv_coord_t)(area->x2 + drv->offset_x), + .y2 = (lv_coord_t)(area->y2 + drv->offset_y)}; + + drv->flush_cb(drv, &offset_area, color_p); +} + +static void _draw_buf_flush(lv_disp_t* disp) +{ + lv_disp_draw_buf_t* draw_buf = lv_disp_get_draw_buf(disp); + + /*Flush the rendered content to the display*/ + lv_draw_ctx_t* draw_ctx = disp->driver->draw_ctx; + if (draw_ctx->wait_for_finish) draw_ctx->wait_for_finish(draw_ctx); + + /* In double buffered mode wait until the other buffer is freed + * and driver is ready to receive the new buffer */ + if (draw_buf->buf1 && draw_buf->buf2) { + while (draw_buf->flushing) { + if (disp->driver->wait_cb) + disp->driver->wait_cb(disp->driver); + } + } + + draw_buf->flushing = 1; + draw_buf->flushing_last = 1; + + if (disp->driver->flush_cb) { + _call_flush_cb(disp->driver, draw_ctx->buf_area, + (lv_color_t*)draw_ctx->buf); + } + + /*If there are 2 buffers swap them. */ + if (draw_buf->buf1 && draw_buf->buf2) { + if (draw_buf->buf_act == draw_buf->buf1) + draw_buf->buf_act = draw_buf->buf2; + else + draw_buf->buf_act = draw_buf->buf1; + } +} + void lcdRefresh() { - _lv_inv_area(nullptr, &screen_area); - lv_refr_now(nullptr); + _draw_buf_flush(disp); } void lcdFlushed() diff --git a/radio/src/main.cpp b/radio/src/main.cpp index 08cad2872..77ea49ba1 100644 --- a/radio/src/main.cpp +++ b/radio/src/main.cpp @@ -546,7 +546,7 @@ void perMain() if (usbPlugged() && getSelectedUsbMode() == USB_MASS_STORAGE_MODE) { #if defined(LIBOPENUI) // draw some image showing USB - lcd->reset(); + lcdInitDirectDrawing(); OpenTxTheme::instance()->drawUsbPluggedScreen(lcd); lcdRefresh(); #else