Skip to content

Commit 0b6ecf8

Browse files
committed
Merge branch 'feat/add_lvgl_adapter' into 'master'
feat(lcd): Added the esp_lvgl_adapter component See merge request ae_group/esp-iot-solution!1397
2 parents c6ea906 + d57462b commit 0b6ecf8

File tree

479 files changed

+24423
-40142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

479 files changed

+24423
-40142
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ include:
3333
- '.gitlab/ci/deploy.yml'
3434
- '.gitlab/ci/target_test.yml'
3535
- '.gitlab/ci/publish_docs_to_cdp.yml'
36+
- '.gitlab/ci/upload_metrics.yml'

.gitlab/ci/build.yml

Lines changed: 73 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ build_example_display_lcd_mipi_dsi_avoid_tearing:
430430
- .rules:build:example_display_lcd_mipi_dsi_avoid_tearing
431431
parallel:
432432
matrix:
433-
- IMAGE: espressif/idf:release-v5.4
433+
- IMAGE: espressif/idf:release-v5.5
434434
variables:
435435
EXAMPLE_DIR: examples/display/lcd/mipi_dsi_avoid_tearing
436436

@@ -460,7 +460,7 @@ build_example_display_lcd_rgb_lcd_8bit:
460460
- .rules:build:example_display_lcd_rgb_lcd_8bit
461461
parallel:
462462
matrix:
463-
- IMAGE: espressif/idf:release-v5.3
463+
- IMAGE: espressif/idf:release-v5.5
464464
variables:
465465
EXAMPLE_DIR: examples/display/lcd/rgb_lcd_8bit
466466

@@ -470,10 +470,50 @@ build_example_display_lcd_rgb_avoid_tearing:
470470
- .rules:build:example_display_lcd_rgb_avoid_tearing
471471
parallel:
472472
matrix:
473-
- IMAGE: espressif/idf:release-v5.3
473+
- IMAGE: espressif/idf:release-v5.5
474474
variables:
475475
EXAMPLE_DIR: examples/display/lcd/rgb_avoid_tearing
476476

477+
build_example_display_gui_lvgl_dummy_draw:
478+
extends:
479+
- .build_examples_template
480+
- .rules:build:example_display_gui_lvgl_dummy_draw
481+
variables:
482+
EXAMPLE_DIR: examples/display/gui/lvgl_dummy_draw
483+
IMAGE: espressif/idf:release-v5.5
484+
485+
build_example_display_gui_lvgl_common_demo:
486+
extends:
487+
- .build_examples_template
488+
- .rules:build:example_display_gui_lvgl_common_demo
489+
variables:
490+
EXAMPLE_DIR: examples/display/gui/lvgl_common_demo
491+
IMAGE: espressif/idf:release-v5.5
492+
493+
build_example_display_gui_lvgl_decode_image:
494+
extends:
495+
- .build_examples_template
496+
- .rules:build:example_display_gui_lvgl_decode_image
497+
variables:
498+
EXAMPLE_DIR: examples/display/gui/lvgl_decode_image
499+
IMAGE: espressif/idf:release-v5.5
500+
501+
build_example_display_gui_lvgl_freetype_font:
502+
extends:
503+
- .build_examples_template
504+
- .rules:build:example_display_gui_lvgl_freetype_font
505+
variables:
506+
EXAMPLE_DIR: examples/display/gui/lvgl_freetype_font
507+
IMAGE: espressif/idf:release-v5.5
508+
509+
build_example_display_gui_lvgl_multi_screen:
510+
extends:
511+
- .build_examples_template
512+
- .rules:build:example_display_gui_lvgl_multi_screen
513+
variables:
514+
EXAMPLE_DIR: examples/display/gui/lvgl_multi_screen
515+
IMAGE: espressif/idf:release-v5.5
516+
477517
build_example_extended_vfs_gpio_gpio_simple:
478518
extends:
479519
- .build_examples_template
@@ -617,17 +657,6 @@ build_example_lighting_lightbulb:
617657
variables:
618658
EXAMPLE_DIR: examples/lighting/lightbulb
619659

620-
build_example_lvgl_freetype:
621-
extends:
622-
- .build_examples_template
623-
- .rules:build:example_lvgl_freetype
624-
parallel:
625-
matrix:
626-
- IMAGE: espressif/idf:release-v5.1
627-
variables:
628-
EXAMPLE_TARGET: esp32s3
629-
EXAMPLE_DIR: examples/hmi/lvgl_freetype
630-
631660
build_example_motor_bldc_fan_rainmaker:
632661
extends:
633662
- .build_examples_template
@@ -698,24 +727,6 @@ build_example_ota_simple_ota_example:
698727
EXAMPLE_DIR: examples/ota/simple_ota_example
699728
WARNING_STR: "1/2 app partitions are too small"
700729

701-
build_example_perf_benchmark:
702-
extends:
703-
- .build_examples_template
704-
- .rules:build:example_perf_benchmark
705-
parallel:
706-
matrix:
707-
- IMAGE: espressif/idf:release-v5.3
708-
variables:
709-
EXAMPLE_DIR: examples/hmi/perf_benchmark
710-
711-
build_example_screen:
712-
extends:
713-
- .build_examples_template
714-
- .rules:build:example_screen
715-
variables:
716-
EXAMPLE_DIR: examples/screen
717-
IMAGE: espressif/idf:release-v4.4
718-
719730
build_example_sensors_sensor_control_led:
720731
extends:
721732
- .build_examples_template
@@ -1351,6 +1362,36 @@ build_components_display_tools_esp_lv_fs_test_apps:
13511362
variables:
13521363
EXAMPLE_DIR: components/display/tools/esp_lv_fs/test_apps
13531364

1365+
build_components_display_tools_esp_lvgl_adapter_test_apps:
1366+
extends:
1367+
- .build_examples_template
1368+
- .rules:build:components_display_tools_esp_lvgl_adapter_test_apps
1369+
parallel:
1370+
matrix:
1371+
- IMAGE: espressif/idf:release-v5.5
1372+
variables:
1373+
EXAMPLE_DIR: components/display/tools/esp_lvgl_adapter/test_apps
1374+
1375+
.build_components_display_tools_esp_lvgl_adapter_benchmark_template: &build_components_display_tools_esp_lvgl_adapter_benchmark_template
1376+
extends:
1377+
- .build_examples_template
1378+
- .rules:build:components_display_tools_esp_lvgl_adapter_benchmark
1379+
parallel:
1380+
matrix:
1381+
- IMAGE: espressif/idf:release-v5.5
1382+
1383+
build_components_display_tools_esp_lvgl_adapter_benchmark:
1384+
<<: *build_components_display_tools_esp_lvgl_adapter_benchmark_template
1385+
variables:
1386+
EXAMPLE_CONFIG: "="
1387+
EXAMPLE_DIR: components/display/tools/esp_lvgl_adapter/benchmark
1388+
1389+
build_components_display_tools_esp_lvgl_adapter_rgb888_benchmark:
1390+
<<: *build_components_display_tools_esp_lvgl_adapter_benchmark_template
1391+
variables:
1392+
EXAMPLE_CONFIG: "sdkconfig.ci.rgb888=default"
1393+
EXAMPLE_DIR: components/display/tools/esp_lvgl_adapter/benchmark
1394+
13541395
build_components_display_tools_esp_mmap_assets_test_apps:
13551396
extends:
13561397
- .build_examples_template

.gitlab/ci/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ pack-upload_files:
110110
- job: "build_example_display_lcd_lcd_with_te: [espressif/idf:release-v5.1]"
111111
- job: "build_example_display_lcd_qspi_with_ram: [espressif/idf:release-v5.1]"
112112
- job: "build_example_display_lcd_qspi_without_ram: [espressif/idf:release-v5.3]"
113-
- job: "build_example_display_lcd_rgb_avoid_tearing: [espressif/idf:release-v5.3]"
114-
- job: "build_example_display_lcd_rgb_lcd_8bit: [espressif/idf:release-v5.3]"
113+
- job: "build_example_display_lcd_rgb_avoid_tearing: [espressif/idf:release-v5.5]"
114+
- job: "build_example_display_lcd_rgb_lcd_8bit: [espressif/idf:release-v5.5]"
115115
- job: "build_example_keyboard: [espressif/idf:release-v5.3]"
116116
- job: "build_example_usb_device_bootloader_uf2: [espressif/idf:release-v5.3]"
117117
- job: "build_example_usb_device_usb_dongle: [espressif/idf:release-v5.3]"

.gitlab/ci/pre_check.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ check_pre_commit:
2727
- .pre_check_template
2828
before_script:
2929
- pip install pre-commit
30+
rules:
31+
# Pipelines triggered via the API might not have a base commit SHA, so failures are allowed.
32+
- if: '$CI_PIPELINE_SOURCE == "api"'
33+
allow_failure: true
34+
- when: always
35+
allow_failure: false
3036
script:
3137
- |
3238
# merged results pipelines, by default

0 commit comments

Comments
 (0)