Skip to content

Commit e3a4ed3

Browse files
Horion0415Horion0415
committed
Merge branch 'feat/update_lcd_components' into 'master'
feat(lcd): update the LCD component to support IDF v6.0 See merge request ae_group/esp-iot-solution!1412
2 parents 8160bf5 + 83246fe commit e3a4ed3

File tree

174 files changed

+6034
-1624
lines changed

Some content is hidden

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

174 files changed

+6034
-1624
lines changed

‎.github/workflows/upload_component.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
components/display/lcd/esp_lcd_axs15231b;
4242
components/display/lcd/esp_lcd_co5300;
4343
components/display/lcd/esp_lcd_ek79007;
44+
components/display/lcd/esp_lcd_er88577;
4445
components/display/lcd/esp_lcd_gc9107;
4546
components/display/lcd/esp_lcd_gc9b71;
4647
components/display/lcd/esp_lcd_gc9d01;
@@ -52,6 +53,7 @@ jobs:
5253
components/display/lcd/esp_lcd_panel_io_additions;
5354
components/display/lcd/esp_lcd_sh8601;
5455
components/display/lcd/esp_lcd_spd2010;
56+
components/display/lcd/esp_lcd_st7123;
5557
components/display/lcd/esp_lcd_st7701;
5658
components/display/lcd/esp_lcd_st7703;
5759
components/display/lcd/esp_lcd_st77903_qspi;

‎.gitlab/ci/build.yml‎

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ build_example_display_lcd_lcd_with_te:
420420
- .rules:build:example_display_lcd_lcd_with_te
421421
parallel:
422422
matrix:
423-
- IMAGE: espressif/idf:release-v5.1
423+
- IMAGE: espressif/idf:release-v5.3
424424
variables:
425425
EXAMPLE_DIR: examples/display/lcd/lcd_with_te
426426

@@ -440,7 +440,7 @@ build_example_display_lcd_qspi_with_ram:
440440
- .rules:build:example_display_lcd_qspi_with_ram
441441
parallel:
442442
matrix:
443-
- IMAGE: espressif/idf:release-v5.1
443+
- IMAGE: espressif/idf:release-v5.5
444444
variables:
445445
EXAMPLE_DIR: examples/display/lcd/qspi_with_ram
446446

@@ -1103,7 +1103,7 @@ build_components_display_lcd_esp_lcd_axs15231b_test_apps:
11031103
- .rules:build:components_display_lcd_esp_lcd_axs15231b_test_apps
11041104
parallel:
11051105
matrix:
1106-
- IMAGE: espressif/idf:release-v5.1
1106+
- IMAGE: espressif/idf:release-v5.3
11071107
variables:
11081108
EXAMPLE_DIR: components/display/lcd/esp_lcd_axs15231b/test_apps
11091109

@@ -1113,7 +1113,7 @@ build_components_display_lcd_esp_lcd_co5300_test_apps:
11131113
- .rules:build:components_display_lcd_esp_lcd_co5300_test_apps
11141114
parallel:
11151115
matrix:
1116-
- IMAGE: espressif/idf:release-v5.3
1116+
- IMAGE: espressif/idf:release-v5.4
11171117
variables:
11181118
EXAMPLE_DIR: components/display/lcd/esp_lcd_co5300/test_apps
11191119

@@ -1127,6 +1127,16 @@ build_components_display_lcd_esp_lcd_ek79007_test_apps:
11271127
variables:
11281128
EXAMPLE_DIR: components/display/lcd/esp_lcd_ek79007/test_apps
11291129

1130+
build_components_display_lcd_esp_lcd_er88577_test_apps:
1131+
extends:
1132+
- .build_examples_template
1133+
- .rules:build:components_display_lcd_esp_lcd_er88577_test_apps
1134+
parallel:
1135+
matrix:
1136+
- IMAGE: espressif/idf:release-v5.3
1137+
variables:
1138+
EXAMPLE_DIR: components/display/lcd/esp_lcd_er88577/test_apps
1139+
11301140
build_components_display_lcd_esp_lcd_jd9165_test_apps:
11311141
extends:
11321142
- .build_examples_template
@@ -1143,7 +1153,7 @@ build_components_display_lcd_esp_lcd_jd9365_test_apps:
11431153
- .rules:build:components_display_lcd_esp_lcd_jd9365_test_apps
11441154
parallel:
11451155
matrix:
1146-
- IMAGE: espressif/idf:release-v5.3
1156+
- IMAGE: espressif/idf:release-v5.4
11471157
variables:
11481158
EXAMPLE_DIR: components/display/lcd/esp_lcd_jd9365/test_apps
11491159

@@ -1163,7 +1173,7 @@ build_components_display_lcd_esp_lcd_gc9b71_test_apps:
11631173
- .rules:build:components_display_lcd_esp_lcd_gc9b71_test_apps
11641174
parallel:
11651175
matrix:
1166-
- IMAGE: espressif/idf:release-v5.1
1176+
- IMAGE: espressif/idf:release-v5.3
11671177
variables:
11681178
EXAMPLE_DIR: components/display/lcd/esp_lcd_gc9b71/test_apps
11691179

@@ -1204,8 +1214,7 @@ build_components_display_lcd_esp_lcd_nv3022b_test_apps:
12041214
- .rules:build:components_display_lcd_esp_lcd_nv3022b_test_apps
12051215
parallel:
12061216
matrix:
1207-
- IMAGE: espressif/idf:release-v4.4
1208-
- IMAGE: espressif/idf:release-v5.1
1217+
- IMAGE: espressif/idf:release-v5.3
12091218
variables:
12101219
EXAMPLE_DIR: components/display/lcd/esp_lcd_nv3022b/test_apps
12111220

@@ -1215,18 +1224,17 @@ build_components_display_lcd_esp_lcd_nv3052_test_apps:
12151224
- .rules:build:components_display_lcd_esp_lcd_nv3052_test_apps
12161225
parallel:
12171226
matrix:
1218-
- IMAGE: espressif/idf:release-v5.3
1227+
- IMAGE: espressif/idf:release-v5.4
12191228
variables:
12201229
EXAMPLE_DIR: components/display/lcd/esp_lcd_nv3052/test_apps
1221-
allow_failure: true # Temporarily disable build CI check, remove this line to restore strict checking after issues are fixed
12221230

12231231
build_components_display_lcd_esp_lcd_sh8601_test_apps:
12241232
extends:
12251233
- .build_examples_template
12261234
- .rules:build:components_display_lcd_esp_lcd_sh8601_test_apps
12271235
parallel:
12281236
matrix:
1229-
- IMAGE: espressif/idf:release-v5.1
1237+
- IMAGE: espressif/idf:release-v5.3
12301238
variables:
12311239
EXAMPLE_DIR: components/display/lcd/esp_lcd_sh8601/test_apps
12321240

@@ -1236,7 +1244,7 @@ build_components_display_lcd_esp_lcd_spd2010_test_apps:
12361244
- .rules:build:components_display_lcd_esp_lcd_spd2010_test_apps
12371245
parallel:
12381246
matrix:
1239-
- IMAGE: espressif/idf:release-v5.1
1247+
- IMAGE: espressif/idf:release-v5.3
12401248
variables:
12411249
EXAMPLE_DIR: components/display/lcd/esp_lcd_spd2010/test_apps
12421250

@@ -1246,17 +1254,27 @@ build_components_display_lcd_esp_lcd_st7701_test_apps:
12461254
- .rules:build:components_display_lcd_esp_lcd_st7701_test_apps
12471255
parallel:
12481256
matrix:
1249-
- IMAGE: espressif/idf:release-v5.3
1257+
- IMAGE: espressif/idf:release-v5.4
12501258
variables:
12511259
EXAMPLE_DIR: components/display/lcd/esp_lcd_st7701/test_apps
12521260

1261+
build_components_display_lcd_esp_lcd_st7123_test_apps:
1262+
extends:
1263+
- .build_examples_template
1264+
- .rules:build:components_display_lcd_esp_lcd_st7123_test_apps
1265+
parallel:
1266+
matrix:
1267+
- IMAGE: espressif/idf:release-v5.4
1268+
variables:
1269+
EXAMPLE_DIR: components/display/lcd/esp_lcd_st7123/test_apps
1270+
12531271
build_components_display_lcd_esp_lcd_st7703_test_apps:
12541272
extends:
12551273
- .build_examples_template
12561274
- .rules:build:components_display_lcd_esp_lcd_st7703_test_apps
12571275
parallel:
12581276
matrix:
1259-
- IMAGE: espressif/idf:release-v5.3
1277+
- IMAGE: espressif/idf:release-v5.4
12601278
variables:
12611279
EXAMPLE_DIR: components/display/lcd/esp_lcd_st7703/test_apps
12621280

@@ -1276,7 +1294,7 @@ build_components_display_lcd_esp_lcd_st77903_rgb_test_apps:
12761294
- .rules:build:components_display_lcd_esp_lcd_st77903_rgb_test_apps
12771295
parallel:
12781296
matrix:
1279-
- IMAGE: espressif/idf:release-v5.1
1297+
- IMAGE: espressif/idf:release-v5.4
12801298
variables:
12811299
EXAMPLE_DIR: components/display/lcd/esp_lcd_st77903_rgb/test_apps
12821300

@@ -1286,7 +1304,7 @@ build_components_display_lcd_esp_lcd_st77916_test_apps:
12861304
- .rules:build:components_display_lcd_esp_lcd_st77916_test_apps
12871305
parallel:
12881306
matrix:
1289-
- IMAGE: espressif/idf:release-v5.1
1307+
- IMAGE: espressif/idf:release-v5.4
12901308
variables:
12911309
EXAMPLE_DIR: components/display/lcd/esp_lcd_st77916/test_apps
12921310

@@ -1296,7 +1314,7 @@ build_components_display_lcd_esp_lcd_st77922_test_apps:
12961314
- .rules:build:components_display_lcd_esp_lcd_st77922_test_apps
12971315
parallel:
12981316
matrix:
1299-
- IMAGE: espressif/idf:release-v5.1
1317+
- IMAGE: espressif/idf:release-v5.4
13001318
variables:
13011319
EXAMPLE_DIR: components/display/lcd/esp_lcd_st77922/test_apps
13021320

@@ -1316,7 +1334,7 @@ build_components_display_lcd_touch_esp_lcd_touch_ili2118_test_apps:
13161334
- .rules:build:components_display_lcd_touch_esp_lcd_touch_ili2118_test_apps
13171335
parallel:
13181336
matrix:
1319-
- IMAGE: espressif/idf:release-v5.1
1337+
- IMAGE: espressif/idf:release-v5.3
13201338
variables:
13211339
EXAMPLE_DIR: components/display/lcd_touch/esp_lcd_touch_ili2118/test_apps
13221340

@@ -1337,7 +1355,7 @@ build_components_display_lcd_touch_esp_lcd_touch_st7123_test_apps:
13371355
- .rules:build:components_display_lcd_touch_esp_lcd_touch_st7123_test_apps
13381356
parallel:
13391357
matrix:
1340-
- IMAGE: espressif/idf:release-v5.1
1358+
- IMAGE: espressif/idf:release-v5.4
13411359
variables:
13421360
EXAMPLE_DIR: components/display/lcd_touch/esp_lcd_touch_st7123/test_apps
13431361

‎.gitlab/ci/deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ pack-upload_files:
107107
image: espressif/idf:release-v5.3
108108
tags: ['build']
109109
needs:
110-
- job: "build_example_display_lcd_lcd_with_te: [espressif/idf:release-v5.1]"
111-
- job: "build_example_display_lcd_qspi_with_ram: [espressif/idf:release-v5.1]"
110+
- job: "build_example_display_lcd_lcd_with_te: [espressif/idf:release-v5.3]"
111+
- job: "build_example_display_lcd_qspi_with_ram: [espressif/idf:release-v5.5]"
112112
- job: "build_example_display_lcd_qspi_without_ram: [espressif/idf:release-v5.3]"
113113
- job: "build_example_display_lcd_rgb_avoid_tearing: [espressif/idf:release-v5.5]"
114114
- job: "build_example_display_lcd_rgb_lcd_8bit: [espressif/idf:release-v5.5]"

‎.gitlab/ci/rules.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
.patterns-components_display_lcd_esp_lcd_ek79007: &patterns-components_display_lcd_esp_lcd_ek79007
8787
- "components/display/lcd/esp_lcd_ek79007/**/*"
8888

89+
.patterns-components_display_lcd_esp_lcd_er88577: &patterns-components_display_lcd_esp_lcd_er88577
90+
- "components/display/lcd/esp_lcd_er88577/**/*"
91+
8992
.patterns-components_display_lcd_esp_lcd_jd9165: &patterns-components_display_lcd_esp_lcd_jd9165
9093
- "components/display/lcd/esp_lcd_jd9165/**/*"
9194

@@ -122,6 +125,9 @@
122125
.patterns-components_display_lcd_esp_lcd_st7701: &patterns-components_display_lcd_esp_lcd_st7701
123126
- "components/display/lcd/esp_lcd_st7701/**/*"
124127

128+
.patterns-components_display_lcd_esp_lcd_st7123: &patterns-components_display_lcd_esp_lcd_st7123
129+
- "components/display/lcd/esp_lcd_st7123/**/*"
130+
125131
.patterns-components_display_lcd_esp_lcd_st7703: &patterns-components_display_lcd_esp_lcd_st7703
126132
- "components/display/lcd/esp_lcd_st7703/**/*"
127133

@@ -2012,6 +2018,17 @@
20122018
- <<: *if-dev-push
20132019
changes: *patterns-components_display_lcd_esp_lcd_ek79007
20142020

2021+
.rules:build:components_display_lcd_esp_lcd_er88577_test_apps:
2022+
rules:
2023+
- <<: *if-protected
2024+
- <<: *if-label-build
2025+
- <<: *if-label-target_test
2026+
- <<: *if-trigger-job
2027+
- <<: *if-dev-push
2028+
changes: *patterns-build_system
2029+
- <<: *if-dev-push
2030+
changes: *patterns-components_display_lcd_esp_lcd_er88577
2031+
20152032
.rules:build:components_display_lcd_esp_lcd_jd9165_test_apps:
20162033
rules:
20172034
- <<: *if-protected
@@ -2144,6 +2161,17 @@
21442161
- <<: *if-dev-push
21452162
changes: *patterns-components_display_lcd_esp_lcd_st7701
21462163

2164+
.rules:build:components_display_lcd_esp_lcd_st7123_test_apps:
2165+
rules:
2166+
- <<: *if-protected
2167+
- <<: *if-label-build
2168+
- <<: *if-label-target_test
2169+
- <<: *if-trigger-job
2170+
- <<: *if-dev-push
2171+
changes: *patterns-build_system
2172+
- <<: *if-dev-push
2173+
changes: *patterns-components_display_lcd_esp_lcd_st7123
2174+
21472175
.rules:build:components_display_lcd_esp_lcd_st7703_test_apps:
21482176
rules:
21492177
- <<: *if-protected

‎.gitlab/ci/target_test.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -382,12 +382,12 @@ components_test_esp_lcd_axs15231b:
382382
parallel:
383383
matrix:
384384
- IDF_TARGET: esp32s3
385-
IDF_VERSION: "5.1"
385+
IDF_VERSION: "5.3"
386386
ENV_TAG: "esp32s3_lcd_ev"
387387
tags:
388388
- ${IDF_TARGET}
389389
- ${ENV_TAG}
390-
image: $DOCKER_TARGET_TEST_v5_1_ENV_IMAGE
390+
image: $DOCKER_TARGET_TEST_v5_3_ENV_IMAGE
391391
variables:
392392
TEST_TARGET: esp32s3
393393
TEST_FOLDER: components/display/lcd/esp_lcd_axs15231b
@@ -404,12 +404,12 @@ components_test_esp_lcd_gc9b71:
404404
parallel:
405405
matrix:
406406
- IDF_TARGET: esp32s3
407-
IDF_VERSION: "5.1"
407+
IDF_VERSION: "5.3"
408408
ENV_TAG: "esp32s3_lcd_ev"
409409
tags:
410410
- ${IDF_TARGET}
411411
- ${ENV_TAG}
412-
image: $DOCKER_TARGET_TEST_v5_1_ENV_IMAGE
412+
image: $DOCKER_TARGET_TEST_v5_3_ENV_IMAGE
413413
variables:
414414
TEST_TARGET: esp32s3
415415
TEST_FOLDER: components/display/lcd/esp_lcd_gc9b71
@@ -451,12 +451,12 @@ components_test_esp_lcd_sh8601:
451451
parallel:
452452
matrix:
453453
- IDF_TARGET: esp32s3
454-
IDF_VERSION: "5.1"
454+
IDF_VERSION: "5.3"
455455
ENV_TAG: "esp32s3_lcd_ev"
456456
tags:
457457
- ${IDF_TARGET}
458458
- ${ENV_TAG}
459-
image: $DOCKER_TARGET_TEST_v5_1_ENV_IMAGE
459+
image: $DOCKER_TARGET_TEST_v5_3_ENV_IMAGE
460460
variables:
461461
TEST_TARGET: esp32s3
462462
TEST_FOLDER: components/display/lcd/esp_lcd_sh8601
@@ -473,12 +473,12 @@ components_test_esp_lcd_spd2010:
473473
parallel:
474474
matrix:
475475
- IDF_TARGET: esp32s3
476-
IDF_VERSION: "5.1"
476+
IDF_VERSION: "5.3"
477477
ENV_TAG: "esp32s3_lcd_ev"
478478
tags:
479479
- ${IDF_TARGET}
480480
- ${ENV_TAG}
481-
image: $DOCKER_TARGET_TEST_v5_1_ENV_IMAGE
481+
image: $DOCKER_TARGET_TEST_v5_3_ENV_IMAGE
482482
variables:
483483
TEST_TARGET: esp32s3
484484
TEST_FOLDER: components/display/lcd/esp_lcd_spd2010
@@ -500,7 +500,7 @@ components_test_esp_lcd_st77903_qspi:
500500
tags:
501501
- ${IDF_TARGET}
502502
- ${ENV_TAG}
503-
image: $DOCKER_TARGET_TEST_v5_1_ENV_IMAGE
503+
image: $DOCKER_TARGET_TEST_v5_3_ENV_IMAGE
504504
variables:
505505
TEST_TARGET: esp32s3
506506
TEST_FOLDER: components/display/lcd/esp_lcd_st77903_qspi
@@ -517,12 +517,12 @@ components_test_esp_lcd_st77903_rgb:
517517
parallel:
518518
matrix:
519519
- IDF_TARGET: esp32s3
520-
IDF_VERSION: "5.1"
520+
IDF_VERSION: "5.4"
521521
ENV_TAG: "esp32s3_lcd_ev"
522522
tags:
523523
- ${IDF_TARGET}
524524
- ${ENV_TAG}
525-
image: $DOCKER_TARGET_TEST_v5_1_ENV_IMAGE
525+
image: $DOCKER_TARGET_TEST_v5_4_ENV_IMAGE
526526
variables:
527527
TEST_TARGET: esp32s3
528528
TEST_FOLDER: components/display/lcd/esp_lcd_st77903_rgb
@@ -703,12 +703,12 @@ components_test_esp_lcd_nv3022b:
703703
parallel:
704704
matrix:
705705
- IDF_TARGET: esp32s3
706-
IDF_VERSION: "5.1"
706+
IDF_VERSION: "5.3"
707707
ENV_TAG: "esp32s3_lcd_ev"
708708
tags:
709709
- ${IDF_TARGET}
710710
- ${ENV_TAG}
711-
image: $DOCKER_TARGET_TEST_v5_1_ENV_IMAGE
711+
image: $DOCKER_TARGET_TEST_v5_3_ENV_IMAGE
712712
variables:
713713
TEST_TARGET: esp32s3
714714
TEST_FOLDER: components/display/lcd/esp_lcd_nv3022b
@@ -725,12 +725,12 @@ components_test_esp_lcd_st77916:
725725
parallel:
726726
matrix:
727727
- IDF_TARGET: esp32s3
728-
IDF_VERSION: "5.1"
728+
IDF_VERSION: "5.4"
729729
ENV_TAG: "esp32s3_lcd_ev"
730730
tags:
731731
- ${IDF_TARGET}
732732
- ${ENV_TAG}
733-
image: $DOCKER_TARGET_TEST_v5_1_ENV_IMAGE
733+
image: $DOCKER_TARGET_TEST_v5_4_ENV_IMAGE
734734
variables:
735735
TEST_TARGET: esp32s3
736736
TEST_FOLDER: components/display/lcd/esp_lcd_st77916
@@ -747,12 +747,12 @@ components_test_esp_lcd_st77922:
747747
parallel:
748748
matrix:
749749
- IDF_TARGET: esp32s3
750-
IDF_VERSION: "5.1"
750+
IDF_VERSION: "5.4"
751751
ENV_TAG: "esp32s3_lcd_ev"
752752
tags:
753753
- ${IDF_TARGET}
754754
- ${ENV_TAG}
755-
image: $DOCKER_TARGET_TEST_v5_1_ENV_IMAGE
755+
image: $DOCKER_TARGET_TEST_v5_4_ENV_IMAGE
756756
variables:
757757
TEST_TARGET: esp32s3
758758
TEST_FOLDER: components/display/lcd/esp_lcd_st77922

0 commit comments

Comments
 (0)