Refactoring LVGL integration

Co-Authored-By: belese <2719742+belese@users.noreply.github.com>
MarlinFirmware · Aug 4, 2023 · 5f5e59d · 5f5e59d
1 parent fe4819a
commit 5f5e59d
Show file tree

Hide file tree

Showing 14 changed files with 1,573 additions and 2 deletions.
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
@@ -36,6 +36,7 @@ jobs:
 
         # Native
         - linux_native
+        - linux_native_sdl
 
         # AVR
         - mega2560

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -3187,6 +3187,9 @@
   //#define EXTUI_LOCAL_BEEPER // Enables use of local Beeper pin with external display
 #endif
 
+// Test LVGL UI
+//#define EXTUI_LVGL_TEST
+
 //=============================================================================
 //=============================== Graphical TFTs ==============================
 //=============================================================================
@@ -3399,6 +3402,21 @@
 //
 //#define EASYTHREED_UI
 
+//
+// Simple DirectMedia Layer (SDL) Controller (Native / Simulator with LVGL UI only)
+//
+//#define SDL_CONTROLLER
+#if ENABLED(SDL_CONTROLLER)
+  // SDL Display Resolution
+  #define TFT_WIDTH  480
+  #define TFT_HEIGHT 320
+
+  // SDL Input Devices
+  #define SDL_MOUSE_INPUT
+  #define SDL_MOUSEWHEEL_ENCODER
+  #define SDL_KEYBOARD_INPUT
+#endif
+
 //=============================================================================
 //=============================== Extra Features ==============================
 //=============================================================================

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -1620,6 +1620,11 @@
   #endif
 #endif
 
+#if HAS_LVGL
+  #define LVGL_H_BUFFER_LINES 10    // Number of vertical lines for LVGL buffer size. The minimum value is 10.
+  //#define LVGL_DOUBLE_BUFFERING   // Draw into an off-screen buffer for cleaner screen updates.
+#endif
+
 // LCD Print Progress options. Multiple times may be displayed in turn.
 #if HAS_DISPLAY && ANY(HAS_MEDIA, SET_PROGRESS_MANUALLY)
   #define SHOW_PROGRESS_PERCENT           // Show print progress percentage (doesn't affect progress bar)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
@@ -489,7 +489,7 @@
 #endif
 
 // Extensible UI serial touch screens. (See src/lcd/extui)
-#if ANY(HAS_DGUS_LCD, MALYAN_LCD, ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, NEXTION_TFT, TOUCH_UI_FTDI_EVE)
+#if ANY(HAS_DGUS_LCD, MALYAN_LCD, ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, NEXTION_TFT, TOUCH_UI_FTDI_EVE, EXTUI_LVGL_TEST)
   #define IS_EXTUI 1
   #define EXTENSIBLE_UI
 #endif
@@ -1708,6 +1708,10 @@
   #endif
 #endif
 
+#if ENABLED(EXTUI_LVGL_TEST) && ANY(HAS_FSMC_TFT, HAS_SPI_TFT, SDL_CONTROLLER)
+  #define HAS_LVGL 1
+#endif
+
 #if ANY(HAS_SPI_TFT, HAS_FSMC_TFT, HAS_LTDC_TFT)
   #include "../lcd/tft_io/tft_orientation.h" // for TFT_COLOR_UI_PORTRAIT
 #endif

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
@@ -411,6 +411,17 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
   #error "LIGHTWEIGHT_UI requires a U8GLIB_ST7920-based display."
 #endif
 
+/**
+ * Simple DirectMedia Layer (SDL) Display
+ */
+#if ENABLED(HAS_SDL_DISPLAY) && DISABLED(HAS_LVGL)
+  #error "SDL Display requires a UI with LVGL support."
+#endif
+
+#if defined(LVGL_H_BUFFER_LINES) && LVGL_H_BUFFER_LINES < 10
+  #error "LVGL_H_BUFFER_LINES must be set to a value of 10 or larger."
+#endif
+
 /**
  * SD Card Settings
  */
@@ -2570,6 +2581,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
  * Make sure only one display is enabled
  */
 #if 1 < 0 \
+  + ENABLED(SDL_CONTROLLER) \
   + ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
   + ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
   + (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \