From db9e5cce1fff82149a609939709a94ae02f349a8 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Mon, 22 Apr 2024 16:00:53 +1000
Subject: Improve handling of the display

 - Blank the display when locking to prevent burn-in
 - Delay turning the display on until *exactly* after the first lvgl flush
 - Init the display in the ui task to avoid blocking the rest of boot
---
 src/drivers/display.cpp         | 28 ++++++++++++++++++++++++++--
 src/drivers/include/display.hpp |  1 +
 2 files changed, 27 insertions(+), 2 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/display.cpp b/src/drivers/display.cpp
index c16fc148..5c686811 100644
--- a/src/drivers/display.cpp
+++ b/src/drivers/display.cpp
@@ -5,6 +5,7 @@
  */
 
 #include "display.hpp"
+#include <stdint.h>
 
 #include <cmath>
 #include <cstdint>
@@ -168,7 +169,11 @@ auto Display::Create(IGpios& expander,
 }
 
 Display::Display(IGpios& gpio, spi_device_handle_t handle)
-    : gpio_(gpio), handle_(handle), display_on_(false), brightness_(0) {}
+    : gpio_(gpio),
+      handle_(handle),
+      first_flush_finished_(false),
+      display_on_(false),
+      brightness_(0) {}
 
 Display::~Display() {
   ledc_fade_func_uninstall();
@@ -176,14 +181,28 @@ Display::~Display() {
 
 auto Display::SetDisplayOn(bool enabled) -> void {
   display_on_ = enabled;
+  if (!first_flush_finished_) {
+    return;
+  }
+
+  if (display_on_) {
+    SendCommandWithData(displays::ST77XX_DISPON, nullptr, 0);
+    vTaskDelay(pdMS_TO_TICKS(100));
+  }
+
   int new_duty = display_on_ ? brightness_ : 0;
   SetDutyCycle(new_duty, true);
+
+  if (!display_on_) {
+    vTaskDelay(pdMS_TO_TICKS(100));
+    SendCommandWithData(displays::ST77XX_DISPOFF, nullptr, 0);
+  }
 }
 
 auto Display::SetBrightness(uint_fast8_t percent) -> void {
   brightness_ =
       std::pow(static_cast<double>(percent) / 100.0, 2.8) * 1024.0 + 0.5;
-  if (display_on_) {
+  if (first_flush_finished_ && display_on_) {
     SetDutyCycle(brightness_, false);
   }
 }
@@ -295,6 +314,11 @@ void Display::OnLvglFlush(lv_disp_drv_t* disp_drv,
   SendCommandWithData(displays::ST77XX_RAMWR,
                       reinterpret_cast<uint8_t*>(color_map), size * 2);
 
+  if (!first_flush_finished_ && lv_disp_flush_is_last(disp_drv)) {
+    first_flush_finished_ = true;
+    SetDisplayOn(display_on_);
+  }
+
   lv_disp_flush_ready(&driver_);
 }
 
diff --git a/src/drivers/include/display.hpp b/src/drivers/include/display.hpp
index b0aa5d58..d2e18a5c 100644
--- a/src/drivers/include/display.hpp
+++ b/src/drivers/include/display.hpp
@@ -52,6 +52,7 @@ class Display {
   IGpios& gpio_;
   spi_device_handle_t handle_;
 
+  bool first_flush_finished_;
   bool display_on_;
   uint_fast8_t brightness_;
 
-- 
cgit v1.2.3