WIP

Author: zjwhitehead

inc/sp140/lvgl/lv_conf.h

@@ -1,33 +1,34 @@
-#ifndef LVGL_CORE_H
-#define LVGL_CORE_H
+#ifndef LVGL_CORE_H  // NOLINT(build/header_guard)
+#define LVGL_CORE_H  // NOLINT(build/header_guard)
 
 #include <lvgl.h>
 #include <Adafruit_ST7735.h>
+#include <SPI.h>
 #include "../structs.h"
 
+// LVGL buffer size - adjust based on available memory
+#define LVGL_BUFFER_SIZE 160 * 10  // 10 rows of display width
+
 // Display dimensions
-#define SCREEN_WIDTH 160
+#define SCREEN_WIDTH  160
 #define SCREEN_HEIGHT 128
 
-// LVGL buffer size - optimize for our display
-// Use 1/4 of the screen size to balance memory usage and performance
-#define LVGL_BUFFER_SIZE (SCREEN_WIDTH * (SCREEN_HEIGHT / 4))
+// LVGL refresh time in milliseconds
+#define LVGL_REFRESH_TIME 10
 
-// LVGL refresh time in ms - match the config file setting
-#define LVGL_REFRESH_TIME 40
+// External variables from main sketch
+extern int8_t displayCS;
 
-// Core LVGL globals
-extern int8_t displayCS;  // Display chip select pin
-extern lv_disp_drv_t disp_drv;
-extern lv_disp_draw_buf_t draw_buf;
+// Global variables
+extern lv_display_t* disp;
 extern lv_color_t buf[LVGL_BUFFER_SIZE];
 extern Adafruit_ST7735* tft_driver;
 extern uint32_t lvgl_last_update;
 
-// Core function declarations
+// Function declarations
 void setupLvglBuffer();
 void setupLvglDisplay(const STR_DEVICE_DATA_140_V1& deviceData, int8_t dc_pin, int8_t rst_pin, SPIClass* spi);
-void lvgl_flush_cb(lv_disp_drv_t* disp, const lv_area_t* area, lv_color_t* color_p);
+void lvgl_flush_cb(lv_display_t* disp, const lv_area_t* area, uint8_t* px_map);
 void lv_tick_handler();
 void updateLvgl();
 void displayLvglSplash(const STR_DEVICE_DATA_140_V1& deviceData, int duration);

inc/sp140/lvgl/lvgl_core.h

@@ -35,6 +35,9 @@ build_flags =
 	-D LV_CONF_INCLUDE_SIMPLE
 	-I inc/sp140/lvgl
 	-D LV_LVGL_H_INCLUDE_SIMPLE
+	-D LV_USE_DRAW_SW_BLEND_HELIUM=0
+	-D LV_USE_DRAW_ARM2D_SYNC=0
+	-D LV_USE_NATIVE_HELIUM_ASM=0
 
 build_type = debug
 debug_speed = 12000
@@ -54,7 +57,7 @@ lib_deps =
 	https://github.com/rlogiacco/CircularBuffer@1.4.0
 	https://github.com/openppg/SINE-ESC-CAN
 	https://github.com/openppg/ANT-BMS-CAN#97170331e1faedb5435657806ad6f9579de9552f
-	lvgl/lvgl@^8.4.0
+	lvgl/lvgl@^9.3.0
 lib_ignore =
 	Adafruit SleepyDog Library
 	${extra.lib_ignore}

platformio.ini

@@ -56,7 +56,7 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_CRUISE_CO
 
 const lv_img_dsc_t cruise_control_340255_30 = {
   {
-    LV_IMG_CF_ALPHA_1BIT,
+    LV_COLOR_FORMAT_A1,
     0,
     0,
     30,

src/assets/img/cruise-control-340255-30.c

@@ -53,7 +53,7 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ENERGY_53
 const lv_img_dsc_t energy_539741_26 = {
   // Header struct (lv_img_header_t)
   {
-    LV_IMG_CF_ALPHA_1BIT, // Color format
+    LV_COLOR_FORMAT_A1, // Color format
     0, // Always zero
     0, // Reserved
     24, // Width

src/assets/img/energy-539741-26.c

@@ -57,7 +57,7 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_WARNING_2
 const lv_img_dsc_t warning_2135850_30 = {
   // Header struct (lv_img_header_t)
   {
-    LV_IMG_CF_ALPHA_1BIT,  // Color format
+    LV_COLOR_FORMAT_A1,  // Color format
     0,  // Always zero
     0,  // Reserved
     30,  // Width

src/assets/img/warning_2135850_30.c

@@ -3,8 +3,7 @@
 #include "../../../inc/sp140/esp32s3-config.h"
 
 // Global variables for core LVGL functionality
-lv_disp_drv_t disp_drv;
-lv_disp_draw_buf_t draw_buf;
+lv_display_t* disp = nullptr;
 lv_color_t buf[LVGL_BUFFER_SIZE];
 Adafruit_ST7735* tft_driver = nullptr;
 uint32_t lvgl_last_update = 0;
@@ -14,11 +13,6 @@ void setupLvglBuffer() {
   USBSerial.println("Initializing LVGL");
   lv_init();
   USBSerial.println("LVGL initialized");
-
-  // Setup buffer for LVGL
-  USBSerial.println("Setting up LVGL buffer");
-  lv_disp_draw_buf_init(&draw_buf, buf, NULL, LVGL_BUFFER_SIZE);
-  USBSerial.println("LVGL buffer initialized");
 }
 
 void setupLvglDisplay(const STR_DEVICE_DATA_140_V1& deviceData, int8_t dc_pin, int8_t rst_pin, SPIClass* spi) {
@@ -37,33 +31,29 @@ void setupLvglDisplay(const STR_DEVICE_DATA_140_V1& deviceData, int8_t dc_pin, i
   // Initialize LVGL buffer
   setupLvglBuffer();
 
-  // Initialize display driver
-  static lv_disp_drv_t disp_drv;
-  lv_disp_drv_init(&disp_drv);
+  // Create display with LVGL v9 API
+  disp = lv_display_create(SCREEN_WIDTH, SCREEN_HEIGHT);
 
-  // Set display driver properties
-  disp_drv.hor_res = SCREEN_WIDTH;
-  disp_drv.ver_res = SCREEN_HEIGHT;
-  disp_drv.flush_cb = lvgl_flush_cb;
-  disp_drv.draw_buf = &draw_buf;
+  // Set up the draw buffer
+  lv_display_set_buffers(disp, buf, NULL, sizeof(buf), LV_DISPLAY_RENDER_MODE_PARTIAL);
 
-  // Register the display driver
-  lv_disp_drv_register(&disp_drv);
+  // Set the flush callback
+  lv_display_set_flush_cb(disp, lvgl_flush_cb);
 
   // Set LVGL default theme - using default font
   lv_theme_t* theme = lv_theme_default_init(
-    lv_disp_get_default(),                // Display
-    lv_palette_main(LV_PALETTE_BLUE),     // Primary color
-    lv_palette_main(LV_PALETTE_AMBER),    // Secondary color
-    deviceData.theme == 1,                // Dark mode
-    LV_FONT_DEFAULT);                     // Default font
+    disp,                             // Display
+    lv_palette_main(LV_PALETTE_BLUE), // Primary color
+    lv_palette_main(LV_PALETTE_AMBER),// Secondary color
+    deviceData.theme == 1,            // Dark mode
+    LV_FONT_DEFAULT);                 // Default font
 
-  lv_disp_set_theme(lv_disp_get_default(), theme);
+  lv_display_set_theme(disp, theme);
 }
 
 // Optimize the flush callback to minimize SPI transfers
 // CS pin management is handled here where actual SPI communication occurs
-void lvgl_flush_cb(lv_disp_drv_t* disp, const lv_area_t* area, lv_color_t* color_p) {
+void lvgl_flush_cb(lv_display_t* disp, const lv_area_t* area, uint8_t* px_map) {
   // Make sure display CS is selected
   digitalWrite(displayCS, LOW);
 
@@ -76,14 +66,14 @@ void lvgl_flush_cb(lv_disp_drv_t* disp, const lv_area_t* area, lv_color_t* color
 
   // Push colors - using DMA if available
   uint32_t len = w * h;
-  tft_driver->writePixels((uint16_t*)color_p, len);
+  tft_driver->writePixels((uint16_t*)px_map, len);
   tft_driver->endWrite();
 
   // Deselect display CS when done
   digitalWrite(displayCS, HIGH);
 
   // Indicate to LVGL that flush is done
-  lv_disp_flush_ready(disp);
+  lv_display_flush_ready(disp);
 }
 
 // LVGL tick handler - to be called from timer or in main loop
@@ -104,7 +94,7 @@ void updateLvgl() {
   // Update LVGL at the defined refresh rate
   if (current_ms - lvgl_last_update > LVGL_REFRESH_TIME) {
     lv_tick_handler();
-    lv_task_handler();
+    lv_timer_handler();
     lvgl_last_update = current_ms;
   }
 }
@@ -114,10 +104,10 @@ void displayLvglSplash(const STR_DEVICE_DATA_140_V1& deviceData, int duration) {
 
   // Create a new screen for the splash
   lv_obj_t* splash_screen = lv_obj_create(NULL);
-  lv_scr_load(splash_screen);
+  lv_screen_load(splash_screen);
 
   // Disable scrollbars
-  lv_obj_clear_flag(splash_screen, LV_OBJ_FLAG_SCROLLABLE);
+  lv_obj_remove_flag(splash_screen, LV_OBJ_FLAG_SCROLLABLE);
 
   // Set background color based on theme
   lv_obj_set_style_bg_color(splash_screen,
@@ -139,7 +129,7 @@ void displayLvglSplash(const STR_DEVICE_DATA_140_V1& deviceData, int duration) {
   lv_anim_init(&title_anim);
   lv_anim_set_var(&title_anim, title_label);
   lv_anim_set_values(&title_anim, 0, 255);
-  lv_anim_set_time(&title_anim, 500);
+  lv_anim_set_duration(&title_anim, 500);
   lv_anim_set_exec_cb(&title_anim, [](void* var, int32_t value) {
     lv_obj_set_style_opa((lv_obj_t*)var, value, 0);
   });

src/sp140/lvgl/lvgl_core.cpp

@@ -405,7 +405,7 @@ void setupMainScreen(bool darkMode) {
   // Draw divider lines
   // Create horizontal line between top and middle sections
   lv_obj_t* h_line1 = lv_line_create(main_screen);
-  static lv_point_t h_line1_points[] = {{0, 37}, {SCREEN_WIDTH, 37}};
+  static lv_point_precise_t h_line1_points[] = {{0, 37}, {SCREEN_WIDTH, 37}};
   lv_line_set_points(h_line1, h_line1_points, 2);
   lv_obj_set_style_line_color(h_line1,
                              LVGL_GRAY,
@@ -414,7 +414,7 @@ void setupMainScreen(bool darkMode) {
 
   // Create horizontal line between middle and bottom sections (stop at new section boundary)
   lv_obj_t* h_line2 = lv_line_create(main_screen);
-  static lv_point_t h_line2_points[] = {{0, 70}, {148, 70}};
+  static lv_point_precise_t h_line2_points[] = {{0, 70}, {148, 70}};
   lv_line_set_points(h_line2, h_line2_points, 2);
   lv_obj_set_style_line_color(h_line2,
                              LVGL_GRAY,
@@ -423,7 +423,7 @@ void setupMainScreen(bool darkMode) {
 
   // Create vertical line in middle section (shifted left by 6 pixels)
   lv_obj_t* v_line1 = lv_line_create(main_screen);
-  static lv_point_t v_line1_points[] = {{102, 37}, {102, 70}};
+  static lv_point_precise_t v_line1_points[] = {{102, 37}, {102, 70}};
   lv_line_set_points(v_line1, v_line1_points, 2);
   lv_obj_set_style_line_color(v_line1,
                              LVGL_GRAY,
@@ -432,7 +432,7 @@ void setupMainScreen(bool darkMode) {
 
   // Create vertical line in bottom section (moved left 3px)
   lv_obj_t* v_line2 = lv_line_create(main_screen);
-  static lv_point_t v_line2_points[] = {{117, 70}, {117, 128}};
+  static lv_point_precise_t v_line2_points[] = {{117, 70}, {117, 128}};
   lv_line_set_points(v_line2, v_line2_points, 2);
   lv_obj_set_style_line_color(v_line2,
                              LVGL_GRAY,
@@ -441,7 +441,7 @@ void setupMainScreen(bool darkMode) {
 
   // Create vertical line for new far-right section (12px from right edge)
   lv_obj_t* v_line3 = lv_line_create(main_screen);
-  static lv_point_t v_line3_points[] = {{148, 37}, {148, 128}};
+  static lv_point_precise_t v_line3_points[] = {{148, 37}, {148, 128}};
   lv_line_set_points(v_line3, v_line3_points, 2);
   lv_obj_set_style_line_color(v_line3,
                              LVGL_GRAY,
@@ -451,7 +451,7 @@ void setupMainScreen(bool darkMode) {
   // Create horizontal dividers for temperature section
   // Line between B and E at Y=89 (start from moved vertical line)
   lv_obj_t* h_line3 = lv_line_create(main_screen);
-  static lv_point_t h_line3_points[] = {{117, 89}, {148, 89}};
+  static lv_point_precise_t h_line3_points[] = {{117, 89}, {148, 89}};
   lv_line_set_points(h_line3, h_line3_points, 2);
   lv_obj_set_style_line_color(h_line3,
                              LVGL_GRAY,
@@ -460,7 +460,7 @@ void setupMainScreen(bool darkMode) {
 
   // Line between E and M at Y=109 (start from moved vertical line)
   lv_obj_t* h_line4 = lv_line_create(main_screen);
-  static lv_point_t h_line4_points[] = {{117, 109}, {148, 109}};
+  static lv_point_precise_t h_line4_points[] = {{117, 109}, {148, 109}};
   lv_line_set_points(h_line4, h_line4_points, 2);
   lv_obj_set_style_line_color(h_line4,
                              LVGL_GRAY,
@@ -478,8 +478,8 @@ void setupMainScreen(bool darkMode) {
   lv_obj_add_flag(arm_indicator, LV_OBJ_FLAG_HIDDEN);
 
   // Create cruise control icon (initially hidden)
-  cruise_icon_img = lv_img_create(main_screen);
-  lv_img_set_src(cruise_icon_img, &cruise_control_340255_30);  // Use the new 30x30 image descriptor
+  cruise_icon_img = lv_image_create(main_screen);
+  lv_image_set_src(cruise_icon_img, &cruise_control_340255_30);  // Use the new 30x30 image descriptor
 
   // Set icon color using recoloring based on theme
   lv_color_t icon_color;
@@ -496,8 +496,8 @@ void setupMainScreen(bool darkMode) {
   lv_obj_add_flag(cruise_icon_img, LV_OBJ_FLAG_HIDDEN);  // Hide initially
 
   // Create charging icon (initially hidden)
-  charging_icon_img = lv_img_create(main_screen);
-  lv_img_set_src(charging_icon_img, &energy_539741_26);
+  charging_icon_img = lv_image_create(main_screen);
+  lv_image_set_src(charging_icon_img, &energy_539741_26);
   lv_obj_align_to(charging_icon_img, battery_label, LV_ALIGN_OUT_RIGHT_MID, 3, 0);  // Align to right of battery label
 
   // Set charging icon color based on theme
@@ -508,8 +508,8 @@ void setupMainScreen(bool darkMode) {
   lv_obj_add_flag(charging_icon_img, LV_OBJ_FLAG_HIDDEN);  // Hide initially
 
   // Create arm fail warning icon (initially hidden)
-  arm_fail_warning_icon_img = lv_img_create(main_screen);
-  lv_img_set_src(arm_fail_warning_icon_img, &warning_2135850_30);
+  arm_fail_warning_icon_img = lv_image_create(main_screen);
+  lv_image_set_src(arm_fail_warning_icon_img, &warning_2135850_30);
   // Align in the same position as the cruise icon
   lv_obj_align(arm_fail_warning_icon_img, LV_ALIGN_CENTER, 12, -9);
 
@@ -529,7 +529,7 @@ void setupMainScreen(bool darkMode) {
   lv_obj_set_style_border_width(spinner_overlay, 0, LV_PART_MAIN);
 
   // Create spinning animation at the top center - now place on top of overlay
-  spinner = lv_spinner_create(spinner_overlay, 1000, 60);  // 1000ms period, 60 arcade width
+  spinner = lv_spinner_create(spinner_overlay);  // LVGL v9 simplified API
   lv_obj_set_size(spinner, 80, 80);  // Even larger spinner for visibility
   lv_obj_align(spinner, LV_ALIGN_CENTER, 0, 0);  // Position at center of screen
 
@@ -559,7 +559,7 @@ void setupMainScreen(bool darkMode) {
 
     // Create horizontal divider line running from section start to screen edge
     climb_rate_divider_lines[i] = lv_line_create(main_screen);
-    static lv_point_t line_points[13][2];  // Static array for all line points
+    static lv_point_precise_t line_points[13][2];  // Static array for all line points
     line_points[i][0].x = 148;  // Start at section boundary
     line_points[i][0].y = y_pos;
     line_points[i][1].x = 160;  // End at screen edge
@@ -615,5 +615,5 @@ void setupMainScreen(bool darkMode) {
   setupAlertCounterUI(darkMode);
 
   // Load the screen
-  lv_scr_load(main_screen);
+  lv_screen_load(main_screen);
 }

src/sp140/lvgl/lvgl_main_screen.cpp

@@ -618,7 +618,7 @@ void setup() {
 
   // Explicitly load the main screen to make it active
   if (main_screen != NULL) {
-      lv_scr_load(main_screen);
+      lv_screen_load(main_screen);
       USBSerial.println("Main screen loaded");
   } else {
      USBSerial.println("Error: Main screen object is NULL after setup attempt.");