Skip to content

Commit 09c4d11

Browse files
committed
Merge branch 'bugfix/fix_examples_qspi_without_ram_avoid_tear' into 'master'
fix(examples): fix qspi_without_ram build error when enable avoid tearing See merge request ae_group/esp-iot-solution!1076
2 parents 02dfaf8 + e71f4e2 commit 09c4d11

File tree

7 files changed

+19
-5
lines changed

7 files changed

+19
-5
lines changed

.gitlab/ci/build.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,16 @@ build_example_display_lcd_qspi_with_ram:
343343
variables:
344344
EXAMPLE_DIR: examples/display/lcd/qspi_with_ram
345345

346+
build_example_display_lcd_qspi_without_ram:
347+
extends:
348+
- .build_examples_template
349+
- .rules:build:example_display_lcd_qspi_without_ram
350+
parallel:
351+
matrix:
352+
- IMAGE: espressif/idf:release-v5.3
353+
variables:
354+
EXAMPLE_DIR: examples/display/lcd/qspi_without_ram
355+
346356
build_example_display_lcd_rgb_lcd_8bit:
347357
extends:
348358
- .build_examples_template

.gitlab/ci/rules.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404
- "examples/display/lcd/qspi_with_ram/**/*"
405405

406406
.patterns-example_display_lcd_qspi_without_ram: &patterns-example_display_lcd_qspi_without_ram
407-
- "examples/display/lcd/qspi_without_ram/**"
407+
- "examples/display/lcd/qspi_without_ram/**/*"
408408

409409
.patterns-example_display_lcd_rgb_lcd_8bit: &patterns-example_display_lcd_rgb_lcd_8bit
410410
- "examples/display/lcd/rgb_lcd_8bit/**/*"

examples/.build-rules.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ examples/display/lcd/qspi_with_ram:
128128
enable:
129129
- if: IDF_TARGET in ["esp32","esp32c2","esp32c3","esp32c6","esp32h2","esp32s2", "esp32s3"] and (IDF_VERSION_MAJOR == 5 and IDF_VERSION_MINOR == 1)
130130

131+
examples/display/lcd/qspi_without_ram:
132+
enable:
133+
- if: IDF_TARGET in ["esp32s3"] and (IDF_VERSION_MAJOR == 5 and IDF_VERSION_MINOR == 3)
134+
131135
examples/display/lcd/rgb_lcd_8bit:
132136
enable:
133137
- if: IDF_TARGET in ["esp32s3"]

examples/display/lcd/qspi_without_ram/main/lvgl_port.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ static lv_disp_t *display_init(esp_lcd_panel_handle_t panel_handle)
405405
st77903_qspi_event_callbacks_t cbs = {
406406
.on_vsync = qspi_lcd_on_trans_event,
407407
};
408-
esp_lcd_st77903_qspi_register_event_callbacks(lcd_handle, &cbs, NULL);
408+
esp_lcd_st77903_qspi_register_event_callbacks(panel_handle, &cbs, NULL);
409409
#else
410410
// Normmaly, for QSPI LCD, we just use one buffer for LVGL rendering
411411
buffer_size = LVGL_PORT_H_RES * LVGL_PORT_BUFFER_HEIGHT;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_ENABLE=y
22
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE_1=y
3-
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=1
3+
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_ENABLE=y
22
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE_2=y
3-
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=2
3+
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_ENABLE=y
22
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE_3=y
3-
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=3
3+
CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=2

0 commit comments

Comments
 (0)