Merge branch 'feat/update_lcd_components' into 'master'

feat(lcd): Add LCD component support for S31 and introduce new LCD component

See merge request ae_group/esp-iot-solution!1578

Author: Horion0415

.gitlab/ci/build.yml

@@ -1151,6 +1151,14 @@ build_components_display_lcd_esp_lcd_gc9d01_test_apps:
   variables:
     EXAMPLE_DIR: components/display/lcd/esp_lcd_gc9d01/test_apps
 
+build_components_display_lcd_esp_lcd_gc9503_mipi_test_apps:
+  extends:
+    - .build_examples_template
+    - .rules:build:components_display_lcd_esp_lcd_gc9503_mipi_test_apps
+    - .build_idf_ge_than_v5_3
+  variables:
+    EXAMPLE_DIR: components/display/lcd/esp_lcd_gc9503_mipi/test_apps
+
 build_components_display_lcd_esp_lcd_hx8399_test_apps:
   extends:
     - .build_examples_template
@@ -1255,6 +1263,14 @@ build_components_display_lcd_esp_lcd_st77922_test_apps:
   variables:
     EXAMPLE_DIR: components/display/lcd/esp_lcd_st77922/test_apps
 
+build_components_display_lcd_esp_lcd_st77926_test_apps:
+  extends:
+    - .build_examples_template
+    - .rules:build:components_display_lcd_esp_lcd_st77926_test_apps
+    - .build_idf_ge_than_v5_4
+  variables:
+    EXAMPLE_DIR: components/display/lcd/esp_lcd_st77926/test_apps
+
 build_components_display_lcd_esp_lcd_usb_display_test_apps:
   extends:
     - .build_examples_template
@@ -1263,6 +1279,14 @@ build_components_display_lcd_esp_lcd_usb_display_test_apps:
   variables:
     EXAMPLE_DIR: components/display/lcd/esp_lcd_usb_display/test_apps
 
+build_components_display_lcd_touch_esp_lcd_touch_ft6336u_test_apps:
+  extends:
+    - .build_examples_template
+    - .rules:build:components_display_lcd_touch_esp_lcd_touch_ft6336u_test_apps
+    - .build_idf_ge_than_v5_4
+  variables:
+    EXAMPLE_DIR: components/display/lcd_touch/esp_lcd_touch_ft6336u/test_apps
+
 build_components_display_lcd_touch_esp_lcd_touch_ili2118_test_apps:
   extends:
     - .build_examples_template
@@ -1287,6 +1311,14 @@ build_components_display_lcd_touch_esp_lcd_touch_st7123_test_apps:
   variables:
     EXAMPLE_DIR: components/display/lcd_touch/esp_lcd_touch_st7123/test_apps
 
+build_components_display_lcd_touch_esp_lcd_touch_st77926_test_apps:
+  extends:
+    - .build_examples_template
+    - .rules:build:components_display_lcd_touch_esp_lcd_touch_st77926_test_apps
+    - .build_idf_ge_than_v5_3
+  variables:
+    EXAMPLE_DIR: components/display/lcd_touch/esp_lcd_touch_st77926/test_apps
+
 build_components_display_tools_esp_lv_decoder_test_apps:
   extends:
     - .build_examples_template

.gitlab/ci/rules.yml

@@ -120,6 +120,9 @@
 .patterns-components_display_lcd_esp_lcd_gc9d01: &patterns-components_display_lcd_esp_lcd_gc9d01
   - "components/display/lcd/esp_lcd_gc9d01/**/*"
 
+.patterns-components_display_lcd_esp_lcd_gc9503_mipi: &patterns-components_display_lcd_esp_lcd_gc9503_mipi
+  - "components/display/lcd/esp_lcd_gc9503_mipi/**/*"
+
 .patterns-components_display_lcd_esp_lcd_hx8399: &patterns-components_display_lcd_esp_lcd_hx8399
   - "components/display/lcd/esp_lcd_hx8399/**/*"
 
@@ -159,9 +162,15 @@
 .patterns-components_display_lcd_esp_lcd_st77922: &patterns-components_display_lcd_esp_lcd_st77922
   - "components/display/lcd/esp_lcd_st77922/**/*"
 
+.patterns-components_display_lcd_esp_lcd_st77926: &patterns-components_display_lcd_esp_lcd_st77926
+  - "components/display/lcd/esp_lcd_st77926/**/*"
+
 .patterns-components_display_lcd_esp_lcd_usb_display: &patterns-components_display_lcd_esp_lcd_usb_display
   - "components/display/lcd/esp_lcd_usb_display/**/*"
 
+.patterns-components_display_lcd_touch_esp_lcd_touch_ft6336u: &patterns-components_display_lcd_touch_esp_lcd_touch_ft6336u
+  - "components/display/lcd_touch/esp_lcd_touch_ft6336u/**/*"
+
 .patterns-components_display_lcd_touch_esp_lcd_touch_ili2118: &patterns-components_display_lcd_touch_esp_lcd_touch_ili2118
   - "components/display/lcd_touch/esp_lcd_touch_ili2118/**/*"
 
@@ -171,6 +180,9 @@
 .patterns-components_display_lcd_touch_esp_lcd_touch_st7123: &patterns-components_display_lcd_touch_esp_lcd_touch_st7123
   - "components/display/lcd_touch/esp_lcd_touch_st7123/**/*"
 
+.patterns-components_display_lcd_touch_esp_lcd_touch_st77926: &patterns-components_display_lcd_touch_esp_lcd_touch_st77926
+  - "components/display/lcd_touch/esp_lcd_touch_st77926/**/*"
+
 .patterns-components_display_tools_esp_lv_decoder: &patterns-components_display_tools_esp_lv_decoder
   - "components/display/tools/esp_lv_decoder/**/*"
   - "tools/cmake_utilities/package_manager.cmake"
@@ -2511,6 +2523,17 @@
     - <<: *if-dev-push
       changes: *patterns-components_display_lcd_esp_lcd_gc9d01
 
+.rules:build:components_display_lcd_esp_lcd_gc9503_mipi_test_apps:
+  rules:
+    - <<: *if-protected
+    - <<: *if-label-build
+    - <<: *if-label-target_test
+    - <<: *if-trigger-job
+    - <<: *if-dev-push
+      changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-components_display_lcd_esp_lcd_gc9503_mipi
+
 .rules:build:components_display_lcd_esp_lcd_hx8399_test_apps:
   rules:
     - <<: *if-protected
@@ -2654,6 +2677,16 @@
     - <<: *if-dev-push
       changes: *patterns-components_display_lcd_esp_lcd_st77922
 
+.rules:build:components_display_lcd_esp_lcd_st77926_test_apps:
+  rules:
+    - <<: *if-protected
+    - <<: *if-label-build
+    - <<: *if-trigger-job
+    - <<: *if-dev-push
+      changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-components_display_lcd_esp_lcd_st77926
+
 .rules:build:components_display_lcd_esp_lcd_usb_display_test_apps:
   rules:
     - <<: *if-protected
@@ -2665,6 +2698,16 @@
     - <<: *if-dev-push
       changes: *patterns-components_display_lcd_esp_lcd_usb_display
 
+.rules:build:components_display_lcd_touch_esp_lcd_touch_ft6336u_test_apps:
+  rules:
+    - <<: *if-protected
+    - <<: *if-label-build
+    - <<: *if-trigger-job
+    - <<: *if-dev-push
+      changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-components_display_lcd_touch_esp_lcd_touch_ft6336u
+
 .rules:build:components_display_lcd_touch_esp_lcd_touch_ili2118_test_apps:
   rules:
     - <<: *if-protected
@@ -2698,6 +2741,16 @@
     - <<: *if-dev-push
       changes: *patterns-components_display_lcd_touch_esp_lcd_touch_st7123
 
+.rules:build:components_display_lcd_touch_esp_lcd_touch_st77926_test_apps:
+  rules:
+    - <<: *if-protected
+    - <<: *if-label-build
+    - <<: *if-trigger-job
+    - <<: *if-dev-push
+      changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-components_display_lcd_touch_esp_lcd_touch_st77926
+
 .rules:build:components_display_tools_esp_lv_decoder_test_apps:
   rules:
     - <<: *if-protected

.gitlab/ci/target_test.yml

@@ -662,6 +662,7 @@ components_test_esp_lcd_st77922:
     TEST_FOLDER: components/display/lcd/esp_lcd_st77922
     TEST_ENV: esp32_s3_lcd_ev_board
 
+
 components_led_lightbulb_driver_test:
   extends:
     - .pytest_template

components/.build-rules.yml

@@ -171,6 +171,10 @@ components/display/lcd/esp_lcd_gc9d01/test_apps:
   enable:
     - if: INCLUDE_DEFAULT == 1
 
+components/display/lcd/esp_lcd_gc9503_mipi/test_apps:
+  enable:
+    - if: IDF_TARGET in ["esp32p4"]
+
 components/display/lcd/esp_lcd_er88577/test_apps:
   enable:
     - if: IDF_TARGET in ["esp32p4"]
@@ -227,10 +231,18 @@ components/display/lcd/esp_lcd_st77922/test_apps:
   enable:
     - if: INCLUDE_DEFAULT == 1
 
+components/display/lcd/esp_lcd_st77926/test_apps:
+  enable:
+    - if: INCLUDE_DEFAULT == 1
+
 components/display/lcd/esp_lcd_usb_display/test_apps:
   enable:
     - if: IDF_TARGET in ["esp32p4"]
 
+components/display/lcd_touch/esp_lcd_touch_ft6336u/test_apps:
+  enable:
+    - if: INCLUDE_DEFAULT == 1
+
 components/display/lcd_touch/esp_lcd_touch_ili2118/test_apps:
   enable:
     - if: INCLUDE_DEFAULT == 1
@@ -243,6 +255,10 @@ components/display/lcd_touch/esp_lcd_touch_st7123/test_apps:
   enable:
     - if: INCLUDE_DEFAULT == 1
 
+components/display/lcd_touch/esp_lcd_touch_st77926/test_apps:
+  enable:
+    - if: INCLUDE_DEFAULT == 1
+
 components/display/tools/esp_lv_decoder/test_apps:
   enable:
     - if: IDF_TARGET in ["esp32s3","esp32c3", "esp32p4"] and IDF_VERSION_MAJOR == 6

components/display/lcd/esp_lcd_axs15231b/README.md

@@ -11,7 +11,7 @@ Implementation of the AXS15231B LCD & Touch controller with esp_lcd component.
 ## Add to project
 
 Packages from this repository are uploaded to [Espressif's component service](https://components.espressif.com/).
-You can add them to your project via `idf.py add-dependancy`, e.g.
+You can add them to your project via `idf.py add-dependency`, e.g.
 ```
     idf.py add-dependency esp_lcd_axs15231b==1.0.0
 ```
@@ -128,8 +128,8 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
 
     ESP_LOGI(TAG, "Install panel IO");
     esp_lcd_panel_io_handle_t io_handle = NULL;
-    const esp_lcd_panel_io_spi_config_t io_config = ILI9341_PANEL_IO_SPI_CONFIG(EXAMPLE_PIN_NUM_LCD_CS, EXAMPLE_PIN_NUM_LCD_DC,
-                                                                                example_callback, &example_callback_ctx);
+    const esp_lcd_panel_io_i80_config_t io_config = AXS15231B_PANEL_IO_I80_CONFIG(EXAMPLE_PIN_NUM_LCD_CS, EXAMPLE_PIN_NUM_LCD_DC,
+                                                                                   example_callback, &example_callback_ctx);
     ESP_ERROR_CHECK(esp_lcd_new_panel_io_i80(i80_bus, &io_config, &io_handle));
 
 /**
@@ -181,7 +181,11 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
     ESP_ERROR_CHECK(esp_lcd_new_panel_io_dbi(mipi_dsi_bus, &dbi_config, &mipi_dbi_io));
 
     ESP_LOGI(TAG, "Install AXS15231B panel driver");
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(6, 0, 0)
     esp_lcd_dpi_panel_config_t dpi_config = AXS15231B_240_960_PANEL_60HZ_DPI_CONFIG(LCD_COLOR_PIXEL_FORMAT_RGB888);
+#else
+    esp_lcd_dpi_panel_config_t dpi_config = AXS15231B_240_960_PANEL_60HZ_DPI_CONFIG_CF(LCD_COLOR_PIXEL_FORMAT_RGB888);
+#endif
     axs15231b_vendor_config_t vendor_config = {
         .flags = {
             .use_mipi_interface = 1,
@@ -207,6 +211,8 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
 
 ```
     esp_lcd_panel_io_i2c_config_t io_config = ESP_LCD_TOUCH_IO_I2C_AXS15231B_CONFIG();
+    esp_lcd_panel_io_handle_t io_handle = NULL;
+    ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_handle, &io_config, &io_handle));
 
     esp_lcd_touch_config_t tp_cfg = {
         .x_max = CONFIG_LCD_HRES,
@@ -225,7 +231,7 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
     };
 
     esp_lcd_touch_handle_t tp;
-    esp_lcd_touch_new_i2c_axs15231b(io_config, &tp_cfg, &tp);
+    esp_lcd_touch_new_i2c_axs15231b(io_handle, &tp_cfg, &tp);
 ```
 
 Read data from the touch controller and store it in RAM memory. It should be called regularly in poll.

components/display/lcd/esp_lcd_axs15231b/test_apps/sdkconfig.defaults.esp32p4

@@ -1,4 +1,5 @@
 CONFIG_IDF_TARGET="esp32p4"
+CONFIG_PARTITION_TABLE_OFFSET=0x10000
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_SPIRAM=y

components/display/lcd/esp_lcd_co5300/README.md

@@ -15,7 +15,7 @@ For more information on LCD, please refer to the [LCD documentation](https://doc
 ## Add to project
 
 Packages from this repository are uploaded to [Espressif's component service](https://components.espressif.com/).
-You can add them to your project via `idf.py add-dependancy`, e.g.
+You can add them to your project via `idf.py add-dependency`, e.g.
 
 ```
     idf.py add-dependency "espressif/esp_lcd_co5300"
@@ -158,7 +158,11 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
 
     ESP_LOGI(TAG, "Install LCD driver of co5300");
     esp_lcd_panel_handle_t panel_handle = NULL;
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(6, 0, 0)
     esp_lcd_dpi_panel_config_t dpi_config = CO5300_466_466_PANEL_60HZ_DPI_CONFIG(EXAMPLE_MIPI_DPI_PX_FORMAT);
+#else
+    esp_lcd_dpi_panel_config_t dpi_config = CO5300_466_466_PANEL_60HZ_DPI_CONFIG_CF(EXAMPLE_MIPI_DPI_PX_FORMAT);
+#endif
     co5300_vendor_config_t vendor_config = {
         // .init_cmds = lcd_init_cmds,      // Uncomment these line if use custom initialization commands
         // .init_cmds_size = sizeof(lcd_init_cmds) / sizeof(co5300_lcd_init_cmd_t),

components/display/lcd/esp_lcd_co5300/test_apps/sdkconfig.defaults.esp32p4

@@ -1,3 +1,4 @@
+CONFIG_PARTITION_TABLE_OFFSET=0x10000
 CONFIG_SPIRAM=y
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_IDF_EXPERIMENTAL_FEATURES=y

components/display/lcd/esp_lcd_ek79007/README.md

@@ -15,7 +15,7 @@ For more information on LCD, please refer to the [LCD documentation](https://doc
 ## Add to project
 
 Packages from this repository are uploaded to [Espressif's component service](https://components.espressif.com/).
-You can add them to your project via `idf.py add-dependancy`, e.g.
+You can add them to your project via `idf.py add-dependency`, e.g.
 
 ```
     idf.py add-dependency "espressif/esp_lcd_ek79007"
@@ -59,14 +59,16 @@ Alternatively, you can create `idf_component.yml`. More is in [Espressif's docum
 
     ESP_LOGI(TAG, "Install EK79007S panel driver");
     esp_lcd_panel_handle_t panel_handle = NULL;
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(6, 0, 0)
     const esp_lcd_dpi_panel_config_t dpi_config = EK79007_1024_600_PANEL_60HZ_CONFIG(EXAMPLE_MIPI_DPI_PX_FORMAT);
+#else
+    const esp_lcd_dpi_panel_config_t dpi_config = EK79007_1024_600_PANEL_60HZ_CONFIG_CF(EXAMPLE_MIPI_DPI_PX_FORMAT);
+#endif
     ek79007_vendor_config_t vendor_config = {
-        .flags = {
-            .use_mipi_interface = 1,
-        },
         .mipi_config = {
             .dsi_bus = mipi_dsi_bus,
             .dpi_config = &dpi_config,
+            .lane_num = 2,
         },
     };
     const esp_lcd_panel_dev_config_t panel_config = {

components/display/lcd/esp_lcd_ek79007/test_apps/sdkconfig.defaults

@@ -1,4 +1,5 @@
 CONFIG_IDF_TARGET="esp32p4"
+CONFIG_PARTITION_TABLE_OFFSET=0x10000
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_SPIRAM=y