From dba7e47ac0aa475ea8d1eae1588b9c6db2d21373 Mon Sep 17 00:00:00 2001 From: Joaquim Date: Thu, 18 Mar 2021 19:38:19 +0000 Subject: [PATCH] FIX screen corruption #213 --- src/components/gfx/Gfx.cpp | 14 ++---- src/displayapp/LittleVgl.cpp | 91 +++++++++++++----------------------- src/drivers/St7789.cpp | 11 +---- src/drivers/St7789.h | 4 +- 4 files changed, 40 insertions(+), 80 deletions(-) diff --git a/src/components/gfx/Gfx.cpp b/src/components/gfx/Gfx.cpp index 59c1da9b..59fa8164 100644 --- a/src/components/gfx/Gfx.cpp +++ b/src/components/gfx/Gfx.cpp @@ -17,9 +17,8 @@ void Gfx::ClearScreen() { state.busy = true; state.action = Action::FillRectangle; state.taskToNotify = xTaskGetCurrentTaskHandle(); - - lcd.BeginDrawBuffer(0, 0, width, height); - lcd.NextDrawBuffer(reinterpret_cast(buffer), width * 2); + + lcd.DrawBuffer(0, 0, width, height, reinterpret_cast(buffer), width * 2); WaitTransferFinished(); } @@ -34,8 +33,7 @@ void Gfx::FillRectangle(uint8_t x, uint8_t y, uint8_t w, uint8_t h, uint16_t col state.color = color; state.taskToNotify = xTaskGetCurrentTaskHandle(); - lcd.BeginDrawBuffer(x, y, w, h); - lcd.NextDrawBuffer(reinterpret_cast(buffer), width * 2); + lcd.DrawBuffer(x, y, w, h, reinterpret_cast(buffer), width * 2); WaitTransferFinished(); } @@ -48,8 +46,7 @@ void Gfx::FillRectangle(uint8_t x, uint8_t y, uint8_t w, uint8_t h, uint8_t* b) state.color = 0x00; state.taskToNotify = xTaskGetCurrentTaskHandle(); - lcd.BeginDrawBuffer(x, y, w, h); - lcd.NextDrawBuffer(reinterpret_cast(b), width * 2); + lcd.DrawBuffer(x, y, w, h, reinterpret_cast(b), width * 2); WaitTransferFinished(); } @@ -120,8 +117,7 @@ void Gfx::DrawChar(const FONT_INFO *font, uint8_t c, uint8_t *x, uint8_t y, uint state.color = color; state.taskToNotify = xTaskGetCurrentTaskHandle(); - lcd.BeginDrawBuffer(*x, y, bytes_in_line*8, font->height); - lcd.NextDrawBuffer(reinterpret_cast(&buffer), bytes_in_line*8*2); + lcd.DrawBuffer(*x, y, bytes_in_line*8, font->height, reinterpret_cast(&buffer), bytes_in_line*8*2); WaitTransferFinished(); *x += font->charInfo[char_idx].widthBits + font->spacePixels; diff --git a/src/displayapp/LittleVgl.cpp b/src/displayapp/LittleVgl.cpp index 44fa5657..238164a8 100644 --- a/src/displayapp/LittleVgl.cpp +++ b/src/displayapp/LittleVgl.cpp @@ -67,65 +67,47 @@ void LittleVgl::SetFullRefresh(FullRefreshDirections direction) { } void LittleVgl::FlushDisplay(const lv_area_t *area, lv_color_t *color_p) { + uint16_t y1, y2, width, height = 0; + ulTaskNotifyTake(pdTRUE, 500); // 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 == LittleVgl::FullRefreshDirections::Down) && (area->y2 == visibleNbLines - 1)) { + writeOffset = ((writeOffset + totalNbLines) - visibleNbLines) % totalNbLines; + } else if( (scrollDirection == FullRefreshDirections::Up) && (area->y1 == 0) ) { + writeOffset = (writeOffset + visibleNbLines) % totalNbLines; + } - // TODO refactore and remove duplicated code + y1 = (area->y1 + writeOffset) % totalNbLines; + y2 = (area->y2 + writeOffset) % totalNbLines; + + width = (area->x2 - area->x1) + 1; + height = (area->y2 - area->y1) + 1; - uint16_t x, y, y1, y2, width, height = 0; if(scrollDirection == LittleVgl::FullRefreshDirections::Down) { - if(area->y2 == visibleNbLines-1) { - writeOffset = ((writeOffset + totalNbLines) - visibleNbLines) % totalNbLines; - } - x = area->x1; - width = (area->x2 - area->x1) + 1; - - y1 = (area->y1 + writeOffset) % totalNbLines; - y2 = (area->y2 + writeOffset) % totalNbLines; - y = y1; - height = (y2 - y1) + 1; - if(area->y2 < visibleNbLines - 1) { uint16_t toScroll = 0; if(area->y1 == 0) { - toScroll = height*2; + 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; + scrollOffset = (totalNbLines) - toScroll; } - - lcd.VerticalScrollDefinition(0, 320, 0); lcd.VerticalScrollStartAddress(scrollOffset); } - lcd.BeginDrawBuffer(x, y, width, height); - lcd.NextDrawBuffer(reinterpret_cast(color_p), width * height*2) ; - } else if(scrollDirection == FullRefreshDirections::Up) { - if(area->y1 == 0) { - writeOffset = (writeOffset + visibleNbLines) % totalNbLines; - } - - x = area->x1; - width = (area->x2 - area->x1) + 1; - - y1 = (area->y1 + writeOffset) % totalNbLines; - y2 = (area->y2 + writeOffset) % totalNbLines; - y = y1; - height = (y2 - y1) + 1; if(area->y1 > 0) { - if(area->y2 == visibleNbLines -1) { + if(area->y2 == visibleNbLines - 1) { scrollOffset += (height * 2); scrollDirection = FullRefreshDirections::None; lv_disp_set_direction(lv_disp_get_default(), 0); @@ -133,36 +115,27 @@ void LittleVgl::FlushDisplay(const lv_area_t *area, lv_color_t *color_p) { scrollOffset += height; } scrollOffset = scrollOffset % totalNbLines; - lcd.VerticalScrollDefinition(0, 320, 0); lcd.VerticalScrollStartAddress(scrollOffset); } - - lcd.BeginDrawBuffer(x, y, width, height); - lcd.NextDrawBuffer(reinterpret_cast(color_p), width * height*2); - } else { - x = area->x1; - width = (area->x2 - area->x1) + 1; - y1 = (area->y1 + writeOffset) % totalNbLines; - y2 = (area->y2 + writeOffset) % totalNbLines; - y = y1; - height = (y2 - y1) + 1; - - if (y2 < y1) { - height = (totalNbLines - 1) - y1; - lcd.BeginDrawBuffer(x, y1, width, height); - lcd.NextDrawBuffer(reinterpret_cast(color_p), width * height * 2); - ulTaskNotifyTake(pdTRUE, 500); - height = y2; - lcd.BeginDrawBuffer(x, 0, width, height); - lcd.NextDrawBuffer(reinterpret_cast(color_p), width * height * 2); - } else { - lcd.BeginDrawBuffer(x, y, width, height); - lcd.NextDrawBuffer(reinterpret_cast(color_p), width * height * 2); - } } - /* IMPORTANT!!! - * Inform the graphics library that you are ready with the flushing*/ + if (y2 < y1) { + height = totalNbLines - y1; + + if ( height > 0 ) { + lcd.DrawBuffer(area->x1, y1, width, height, reinterpret_cast(color_p), width * height * 2); + ulTaskNotifyTake(pdTRUE, 320); + } + uint16_t pixOffset = width * height; + height = y2 + 1; + lcd.DrawBuffer(area->x1, 0, width, height, reinterpret_cast(color_p + pixOffset), width * height * 2); + + } else { + lcd.DrawBuffer(area->x1, y1, width, height, reinterpret_cast(color_p), width * height * 2); + } + + // IMPORTANT!!! + // Inform the graphics library that you are ready with the flushing lv_disp_flush_ready(&disp_drv); } diff --git a/src/drivers/St7789.cpp b/src/drivers/St7789.cpp index 2df2c531..87cbb639 100644 --- a/src/drivers/St7789.cpp +++ b/src/drivers/St7789.cpp @@ -153,16 +153,9 @@ void St7789::DrawPixel(uint16_t x, uint16_t y, uint32_t color) { WriteSpi(reinterpret_cast(&color), 2); } -void St7789::BeginDrawBuffer(uint16_t x, uint16_t y, uint16_t width, uint16_t height) { - if((x >= Width) || (y >= Height)) return; - if((x + width - 1) >= Width) width = Width - x; - if((y + height - 1) >= Height) height = Height - y; - - SetAddrWindow(0+x, ST7789_ROW_OFFSET+y, x+width-1, y+height-1); +void St7789::DrawBuffer(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint8_t *data, size_t size) { + SetAddrWindow(x, y, x + width - 1, y + height - 1); nrf_gpio_pin_set(pinDataCommand); -} - -void St7789::NextDrawBuffer(const uint8_t *data, size_t size) { WriteSpi(data, size); } diff --git a/src/drivers/St7789.h b/src/drivers/St7789.h index a487a952..2c6f9b6b 100644 --- a/src/drivers/St7789.h +++ b/src/drivers/St7789.h @@ -20,9 +20,7 @@ namespace Pinetime { void VerticalScrollDefinition(uint16_t topFixedLines, uint16_t scrollLines, uint16_t bottomFixedLines); void VerticalScrollStartAddress(uint16_t line); - - void BeginDrawBuffer(uint16_t x, uint16_t y, uint16_t width, uint16_t height); - void NextDrawBuffer(const uint8_t* data, size_t size); + void DrawBuffer(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint8_t *data, size_t size); void DisplayOn(); void DisplayOff();