wip

tore-espressif · tore-espressif · commit e6a0e6d491e2 · 2025-08-22T09:02:26.000+02:00
diff --git a/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/ws_7inch.c b/SquareLine/boards/v8/custom_waveshare_7inch/components/ws_7inch/ws_7inch.c
@@ -117,7 +117,7 @@ esp_err_t bsp_display_new(const bsp_display_config_t *config, esp_lcd_panel_hand
     };
     esp_lcd_panel_dev_config_t panel_config = {
         .reset_gpio_num = BSP_LCD_RST,
-        .color_space = ESP_LCD_COLOR_SPACE_RGB,
+        .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB,
         .bits_per_pixel = 16,
         .vendor_config = (void *) &vendor_config,
     };
diff --git a/bsp/esp32_c3_lcdkit/idf_component.yml b/bsp/esp32_c3_lcdkit/idf_component.yml
@@ -21,7 +21,7 @@ dependencies:
     public: true
 
   esp_lcd_gc9a01:
-    version: "^1"
+    version: "^2.0.3"
     public: true
 
   button:
diff --git a/components/esp_lvgl_port/examples/touchscreen/main/main.c b/components/esp_lvgl_port/examples/touchscreen/main/main.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -26,7 +26,6 @@
 #define EXAMPLE_LCD_PIXEL_CLK_HZ    (40 * 1000 * 1000)
 #define EXAMPLE_LCD_CMD_BITS        (8)
 #define EXAMPLE_LCD_PARAM_BITS      (8)
-#define EXAMPLE_LCD_COLOR_SPACE     (ESP_LCD_COLOR_SPACE_BGR)
 #define EXAMPLE_LCD_BITS_PER_PIXEL  (16)
 #define EXAMPLE_LCD_DRAW_BUFF_DOUBLE (1)
 #define EXAMPLE_LCD_DRAW_BUFF_HEIGHT (50)
@@ -101,7 +100,11 @@ static esp_err_t app_lcd_init(void)
     ESP_LOGD(TAG, "Install LCD driver");
     const esp_lcd_panel_dev_config_t panel_config = {
         .reset_gpio_num = EXAMPLE_LCD_GPIO_RST,
-        .color_space = EXAMPLE_LCD_COLOR_SPACE,
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(6, 0, 0)
+        .rgb_endian = LCD_RGB_ENDIAN_BGR,
+#else
+        .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_BGR,
+#endif
         .bits_per_pixel = EXAMPLE_LCD_BITS_PER_PIXEL,
     };
     ESP_GOTO_ON_ERROR(esp_lcd_new_panel_st7789(lcd_io, &panel_config, &lcd_panel), err, TAG, "New panel failed");
diff --git a/components/esp_lvgl_port/test_apps/lvgl_port/main/test.c b/components/esp_lvgl_port/test_apps/lvgl_port/main/test.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: CC0-1.0
  */
@@ -29,7 +29,6 @@
 #define EXAMPLE_LCD_PIXEL_CLK_HZ    (40 * 1000 * 1000)
 #define EXAMPLE_LCD_CMD_BITS        (8)
 #define EXAMPLE_LCD_PARAM_BITS      (8)
-#define EXAMPLE_LCD_COLOR_SPACE     (ESP_LCD_COLOR_SPACE_BGR)
 #define EXAMPLE_LCD_BITS_PER_PIXEL  (16)
 #define EXAMPLE_LCD_DRAW_BUFF_DOUBLE (1)
 #define EXAMPLE_LCD_DRAW_BUFF_HEIGHT (50)
@@ -102,7 +101,11 @@ static esp_err_t app_lcd_init(void)
     ESP_LOGD(TAG, "Install LCD driver");
     const esp_lcd_panel_dev_config_t panel_config = {
         .reset_gpio_num = EXAMPLE_LCD_GPIO_RST,
-        .color_space = EXAMPLE_LCD_COLOR_SPACE,
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(6, 0, 0)
+        .rgb_endian = LCD_RGB_ENDIAN_BGR,
+#else
+        .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_BGR,
+#endif
         .bits_per_pixel = EXAMPLE_LCD_BITS_PER_PIXEL,
     };
     ESP_GOTO_ON_ERROR(esp_lcd_new_panel_st7789(lcd_io, &panel_config, &lcd_panel), err, TAG, "New panel failed");
diff --git a/components/lcd/esp_lcd_ra8875/README.md b/components/lcd/esp_lcd_ra8875/README.md
@@ -94,7 +94,7 @@ const esp_lcd_panel_ra8875_config_t vendor_config = {
 
 esp_lcd_panel_dev_config_t panel_config = {
     .reset_gpio_num = BOARD_DISP_PARALLEL_RST,
-    .color_space = ESP_LCD_COLOR_SPACE_RGB,
+    .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB,
     .bits_per_pixel = 16,
     .vendor_config = (void*)&vendor_config,
 };
diff --git a/components/lcd/esp_lcd_ra8875/esp_lcd_ra8875.c b/components/lcd/esp_lcd_ra8875/esp_lcd_ra8875.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -77,13 +77,14 @@ esp_err_t esp_lcd_new_panel_ra8875(const esp_lcd_panel_io_handle_t io, const esp
     }
 
     // The RA8875 supports only RGB endian
-    // Note: Color space used for compatibility with IDF v4.4
-    switch (panel_dev_config->color_space) {
-    case ESP_LCD_COLOR_SPACE_RGB:
-        break;
-    default:
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
+    if (panel_dev_config->color_space != ESP_LCD_COLOR_SPACE_RGB) {
+#elif ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(6, 0, 0)
+    if (panel_dev_config->rgb_endian != LCD_RGB_ENDIAN_RGB) {
+#else
+    if (panel_dev_config->rgb_ele_order != LCD_RGB_ELEMENT_ORDER_RGB) {
+#endif
         ESP_GOTO_ON_FALSE(false, ESP_ERR_NOT_SUPPORTED, err, TAG, "unsupported color space");
-        break;
     }
 
     switch (panel_dev_config->bits_per_pixel) {
diff --git a/components/lcd/esp_lcd_ra8875/idf_component.yml b/components/lcd/esp_lcd_ra8875/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.0"
+version: "1.0.1"
 description: ESP LCD RA8875
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd/esp_lcd_ra8875
 dependencies:
diff --git a/components/lcd/esp_lcd_st7796/esp_lcd_st7796_mipi.c b/components/lcd/esp_lcd_st7796/esp_lcd_st7796_mipi.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -65,17 +65,43 @@ esp_err_t esp_lcd_new_panel_st7796_mipi(const esp_lcd_panel_io_handle_t io, cons
         ESP_GOTO_ON_ERROR(gpio_config(&io_conf), err, TAG, "configure GPIO for RST line failed");
     }
 
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
     switch (panel_dev_config->color_space) {
+    case ESP_LCD_COLOR_SPACE_RGB:
+        st7796->madctl_val = 0;
+        break;
+    case ESP_LCD_COLOR_SPACE_BGR:
+        st7796->madctl_val |= LCD_CMD_BGR_BIT;
+        break;
+    default:
+        ESP_GOTO_ON_FALSE(false, ESP_ERR_NOT_SUPPORTED, err, TAG, "unsupported color space");
+        break;
+    }
+#elif ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(6, 0, 0)
+    switch (panel_dev_config->rgb_endian) {
+    case LCD_RGB_ENDIAN_RGB:
+        st7796->madctl_val = 0;
+        break;
+    case LCD_RGB_ENDIAN_BGR:
+        st7796->madctl_val |= LCD_CMD_BGR_BIT;
+        break;
+    default:
+        ESP_GOTO_ON_FALSE(false, ESP_ERR_NOT_SUPPORTED, err, TAG, "unsupported rgb endian");
+        break;
+    }
+#else
+    switch (panel_dev_config->rgb_ele_order) {
     case LCD_RGB_ELEMENT_ORDER_RGB:
         st7796->madctl_val = 0;
         break;
     case LCD_RGB_ELEMENT_ORDER_BGR:
         st7796->madctl_val |= LCD_CMD_BGR_BIT;
         break;
     default:
-        ESP_GOTO_ON_FALSE(false, ESP_ERR_NOT_SUPPORTED, err, TAG, "unsupported color space");
+        ESP_GOTO_ON_FALSE(false, ESP_ERR_NOT_SUPPORTED, err, TAG, "unsupported rgb element order");
         break;
     }
+#endif
 
     switch (panel_dev_config->bits_per_pixel) {
     case 16: // RGB565
diff --git a/components/lcd/esp_lcd_st7796/idf_component.yml b/components/lcd/esp_lcd_st7796/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.3.3"
+version: "1.3.4"
 targets:
   - esp32
   - esp32s2
diff --git a/examples/.build-test-rules.yml b/examples/.build-test-rules.yml
@@ -1,7 +1,7 @@
 # Examples: Always build all
 examples:
   disable:
-    - if: CONFIG_NAME in ["esp-box", "esp-box-lite"]
+    - if: CONFIG_NAME in ["esp-box", "esp-box-lite", "esp32_azure_iot_kit"]
       reason: Do not build examples for deprecated BSPs
     - if: (IDF_VERSION_MAJOR == 5 and IDF_VERSION_MINOR < 2) and CONFIG_NAME in ["esp_bsp_generic", "esp_bsp_devkit", "m5stack_core"]
       reason: Example depends on BSP, which is supported only for IDF >= 5.2

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: "1.0.0"`
	`1`	`+version: "1.0.1"`
`2`	`2`	`description: ESP LCD RA8875`
`3`	`3`	`url: https://github.com/espressif/esp-bsp/tree/master/components/lcd/esp_lcd_ra8875`
`4`	`4`	`dependencies:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: "1.3.3"`
	`1`	`+version: "1.3.4"`
`2`	`2`	`targets:`
`3`	`3`	`- esp32`
`4`	`4`	`- esp32s2`