Skip to content

Commit c691068

Browse files
committed
Merge branch 'feat/add_lcd_driver' into 'master'
feat(lcd): add several LCD driver components See merge request ae_group/esp-iot-solution!1318
2 parents f548145 + 16429a2 commit c691068

Some content is hidden

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

68 files changed

+5191
-14
lines changed

.github/workflows/upload_component.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@ jobs:
2929
components/bootloader_support_plus;
3030
components/button;
3131
components/display/lcd/esp_lcd_axs15231b;
32+
components/display/lcd/esp_lcd_co5300;
3233
components/display/lcd/esp_lcd_ek79007;
34+
components/display/lcd/esp_lcd_gc9107;
3335
components/display/lcd/esp_lcd_gc9b71;
36+
components/display/lcd/esp_lcd_gc9d01;
3437
components/display/lcd/esp_lcd_hx8399;
3538
components/display/lcd/esp_lcd_jd9165;
3639
components/display/lcd/esp_lcd_jd9365;
3740
components/display/lcd/esp_lcd_nv3022b;
41+
components/display/lcd/esp_lcd_nv3052;
3842
components/display/lcd/esp_lcd_panel_io_additions;
3943
components/display/lcd/esp_lcd_sh8601;
4044
components/display/lcd/esp_lcd_spd2010;

.gitlab/ci/build.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,6 +1105,16 @@ build_components_display_lcd_esp_lcd_axs15231b_test_apps:
11051105
variables:
11061106
EXAMPLE_DIR: components/display/lcd/esp_lcd_axs15231b/test_apps
11071107

1108+
build_components_display_lcd_esp_lcd_co5300_test_apps:
1109+
extends:
1110+
- .build_examples_template
1111+
- .rules:build:components_display_lcd_esp_lcd_co5300_test_apps
1112+
parallel:
1113+
matrix:
1114+
- IMAGE: espressif/idf:release-v5.3
1115+
variables:
1116+
EXAMPLE_DIR: components/display/lcd/esp_lcd_co5300/test_apps
1117+
11081118
build_components_display_lcd_esp_lcd_ek79007_test_apps:
11091119
extends:
11101120
- .build_examples_template
@@ -1135,6 +1145,16 @@ build_components_display_lcd_esp_lcd_jd9365_test_apps:
11351145
variables:
11361146
EXAMPLE_DIR: components/display/lcd/esp_lcd_jd9365/test_apps
11371147

1148+
build_components_display_lcd_esp_lcd_gc9107_test_apps:
1149+
extends:
1150+
- .build_examples_template
1151+
- .rules:build:components_display_lcd_esp_lcd_gc9107_test_apps
1152+
parallel:
1153+
matrix:
1154+
- IMAGE: espressif/idf:release-v5.3
1155+
variables:
1156+
EXAMPLE_DIR: components/display/lcd/esp_lcd_gc9107/test_apps
1157+
11381158
build_components_display_lcd_esp_lcd_gc9b71_test_apps:
11391159
extends:
11401160
- .build_examples_template
@@ -1145,6 +1165,16 @@ build_components_display_lcd_esp_lcd_gc9b71_test_apps:
11451165
variables:
11461166
EXAMPLE_DIR: components/display/lcd/esp_lcd_gc9b71/test_apps
11471167

1168+
build_components_display_lcd_esp_lcd_gc9d01_test_apps:
1169+
extends:
1170+
- .build_examples_template
1171+
- .rules:build:components_display_lcd_esp_lcd_gc9d01_test_apps
1172+
parallel:
1173+
matrix:
1174+
- IMAGE: espressif/idf:release-v5.3
1175+
variables:
1176+
EXAMPLE_DIR: components/display/lcd/esp_lcd_gc9d01/test_apps
1177+
11481178
build_components_display_lcd_esp_lcd_hx8399_test_apps:
11491179
extends:
11501180
- .build_examples_template
@@ -1177,6 +1207,16 @@ build_components_display_lcd_esp_lcd_nv3022b_test_apps:
11771207
variables:
11781208
EXAMPLE_DIR: components/display/lcd/esp_lcd_nv3022b/test_apps
11791209

1210+
build_components_display_lcd_esp_lcd_nv3052_test_apps:
1211+
extends:
1212+
- .build_examples_template
1213+
- .rules:build:components_display_lcd_esp_lcd_nv3052_test_apps
1214+
parallel:
1215+
matrix:
1216+
- IMAGE: espressif/idf:release-v5.3
1217+
variables:
1218+
EXAMPLE_DIR: components/display/lcd/esp_lcd_nv3052/test_apps
1219+
11801220
build_components_display_lcd_esp_lcd_sh8601_test_apps:
11811221
extends:
11821222
- .build_examples_template

.gitlab/ci/rules.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@
7676
.patterns-components_display_lcd_esp_lcd_axs15231b: &patterns-components_display_lcd_esp_lcd_axs15231b
7777
- "components/display/lcd/esp_lcd_axs15231b/**/*"
7878

79+
.patterns-components_display_lcd_esp_lcd_co5300: &patterns-components_display_lcd_esp_lcd_co5300
80+
- "components/display/lcd/esp_lcd_co5300/**/*"
81+
7982
.patterns-components_display_lcd_esp_lcd_ek79007: &patterns-components_display_lcd_esp_lcd_ek79007
8083
- "components/display/lcd/esp_lcd_ek79007/**/*"
8184

@@ -85,9 +88,15 @@
8588
.patterns-components_display_lcd_esp_lcd_jd9365: &patterns-components_display_lcd_esp_lcd_jd9365
8689
- "components/display/lcd/esp_lcd_jd9365/**/*"
8790

91+
.patterns-components_display_lcd_esp_lcd_gc9107: &patterns-components_display_lcd_esp_lcd_gc9107
92+
- "components/display/lcd/esp_lcd_gc9107/**/*"
93+
8894
.patterns-components_display_lcd_esp_lcd_gc9b71: &patterns-components_display_lcd_esp_lcd_gc9b71
8995
- "components/display/lcd/esp_lcd_gc9b71/**/*"
9096

97+
.patterns-components_display_lcd_esp_lcd_gc9d01: &patterns-components_display_lcd_esp_lcd_gc9d01
98+
- "components/display/lcd/esp_lcd_gc9d01/**/*"
99+
91100
.patterns-components_display_lcd_esp_lcd_hx8399: &patterns-components_display_lcd_esp_lcd_hx8399
92101
- "components/display/lcd/esp_lcd_hx8399/**/*"
93102

@@ -97,6 +106,9 @@
97106
.patterns-components_display_lcd_esp_lcd_nv3022b: &patterns-components_display_lcd_esp_lcd_nv3022b
98107
- "components/display/lcd/esp_lcd_nv3022b/**/*"
99108

109+
.patterns-components_display_lcd_esp_lcd_nv3052: &patterns-components_display_lcd_esp_lcd_nv3052
110+
- "components/display/lcd/esp_lcd_nv3052/**/*"
111+
100112
.patterns-components_display_lcd_esp_lcd_sh8601: &patterns-components_display_lcd_esp_lcd_sh8601
101113
- "components/display/lcd/esp_lcd_sh8601/**/*"
102114

@@ -1914,6 +1926,17 @@
19141926
- <<: *if-dev-push
19151927
changes: *patterns-components_display_lcd_esp_lcd_axs15231b
19161928

1929+
.rules:build:components_display_lcd_esp_lcd_co5300_test_apps:
1930+
rules:
1931+
- <<: *if-protected
1932+
- <<: *if-label-build
1933+
- <<: *if-label-target_test
1934+
- <<: *if-trigger-job
1935+
- <<: *if-dev-push
1936+
changes: *patterns-build_system
1937+
- <<: *if-dev-push
1938+
changes: *patterns-components_display_lcd_esp_lcd_co5300
1939+
19171940
.rules:build:components_display_lcd_esp_lcd_ek79007_test_apps:
19181941
rules:
19191942
- <<: *if-protected
@@ -1947,6 +1970,17 @@
19471970
- <<: *if-dev-push
19481971
changes: *patterns-components_display_lcd_esp_lcd_jd9365
19491972

1973+
.rules:build:components_display_lcd_esp_lcd_gc9107_test_apps:
1974+
rules:
1975+
- <<: *if-protected
1976+
- <<: *if-label-build
1977+
- <<: *if-label-target_test
1978+
- <<: *if-trigger-job
1979+
- <<: *if-dev-push
1980+
changes: *patterns-build_system
1981+
- <<: *if-dev-push
1982+
changes: *patterns-components_display_lcd_esp_lcd_gc9107
1983+
19501984
.rules:build:components_display_lcd_esp_lcd_gc9b71_test_apps:
19511985
rules:
19521986
- <<: *if-protected
@@ -1958,6 +1992,17 @@
19581992
- <<: *if-dev-push
19591993
changes: *patterns-components_display_lcd_esp_lcd_gc9b71
19601994

1995+
.rules:build:components_display_lcd_esp_lcd_gc9d01_test_apps:
1996+
rules:
1997+
- <<: *if-protected
1998+
- <<: *if-label-build
1999+
- <<: *if-label-target_test
2000+
- <<: *if-trigger-job
2001+
- <<: *if-dev-push
2002+
changes: *patterns-build_system
2003+
- <<: *if-dev-push
2004+
changes: *patterns-components_display_lcd_esp_lcd_gc9d01
2005+
19612006
.rules:build:components_display_lcd_esp_lcd_hx8399_test_apps:
19622007
rules:
19632008
- <<: *if-protected
@@ -1991,6 +2036,17 @@
19912036
- <<: *if-dev-push
19922037
changes: *patterns-components_display_lcd_esp_lcd_nv3022b
19932038

2039+
.rules:build:components_display_lcd_esp_lcd_nv3052_test_apps:
2040+
rules:
2041+
- <<: *if-protected
2042+
- <<: *if-label-build
2043+
- <<: *if-label-target_test
2044+
- <<: *if-trigger-job
2045+
- <<: *if-dev-push
2046+
changes: *patterns-build_system
2047+
- <<: *if-dev-push
2048+
changes: *patterns-components_display_lcd_esp_lcd_nv3052
2049+
19942050
.rules:build:components_display_lcd_esp_lcd_sh8601_test_apps:
19952051
rules:
19962052
- <<: *if-protected

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,16 @@ The registered components in ESP-IoT-Solution are listed below:
7878
| [drv10987](https://components.espressif.com/components/espressif/drv10987) | [![Component Registry](https://components.espressif.com/components/espressif/drv10987/badge.svg)](https://components.espressif.com/components/espressif/drv10987) |
7979
| [elf_loader](https://components.espressif.com/components/espressif/elf_loader) | [![Component Registry](https://components.espressif.com/components/espressif/elf_loader/badge.svg)](https://components.espressif.com/components/espressif/elf_loader) |
8080
| [esp_lcd_axs15231b](https://components.espressif.com/components/espressif/esp_lcd_axs15231b) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_axs15231b/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_axs15231b) |
81+
| [esp_lcd_co5300](https://components.espressif.com/components/espressif/esp_lcd_co5300) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_co5300/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_co5300) |
8182
| [esp_lcd_ek79007](https://components.espressif.com/components/espressif/esp_lcd_ek79007) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_ek79007/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_ek79007) |
83+
| [esp_lcd_gc9107](https://components.espressif.com/components/espressif/esp_lcd_gc9107) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_gc9107/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_gc9107) |
8284
| [esp_lcd_gc9b71](https://components.espressif.com/components/espressif/esp_lcd_gc9b71) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_gc9b71/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_gc9b71) |
85+
| [esp_lcd_gc9d01](https://components.espressif.com/components/espressif/esp_lcd_gc9d01) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_gc9d01/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_gc9d01) |
8386
| [esp_lcd_hx8399](https://components.espressif.com/components/espressif/esp_lcd_hx8399) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_hx8399/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_hx8399) |
8487
| [esp_lcd_jd9165](https://components.espressif.com/components/espressif/esp_lcd_jd9165) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_jd9165/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_jd9165) |
8588
| [esp_lcd_jd9365](https://components.espressif.com/components/espressif/esp_lcd_jd9365) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_jd9365/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_jd9365) |
8689
| [esp_lcd_nv3022b](https://components.espressif.com/components/espressif/esp_lcd_nv3022b) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_nv3022b/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_nv3022b) |
90+
| [esp_lcd_nv3052](https://components.espressif.com/components/espressif/esp_lcd_nv3052) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_nv3052/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_nv3052) |
8791
| [esp_lcd_panel_io_additions](https://components.espressif.com/components/espressif/esp_lcd_panel_io_additions) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_panel_io_additions/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_panel_io_additions) |
8892
| [esp_lcd_sh8601](https://components.espressif.com/components/espressif/esp_lcd_sh8601) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_sh8601/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_sh8601) |
8993
| [esp_lcd_spd2010](https://components.espressif.com/components/espressif/esp_lcd_spd2010) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_spd2010/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_spd2010) |

README_CN.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,16 @@ ESP-IoT-Solution 中注册的组件如下:
7878
| [drv10987](https://components.espressif.com/components/espressif/drv10987) | [![Component Registry](https://components.espressif.com/components/espressif/drv10987/badge.svg)](https://components.espressif.com/components/espressif/drv10987) |
7979
| [elf_loader](https://components.espressif.com/components/espressif/elf_loader) | [![Component Registry](https://components.espressif.com/components/espressif/elf_loader/badge.svg)](https://components.espressif.com/components/espressif/elf_loader) |
8080
| [esp_lcd_axs15231b](https://components.espressif.com/components/espressif/esp_lcd_axs15231b) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_axs15231b/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_axs15231b) |
81+
| [esp_lcd_co5300](https://components.espressif.com/components/espressif/esp_lcd_co5300) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_co5300/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_co5300) |
8182
| [esp_lcd_ek79007](https://components.espressif.com/components/espressif/esp_lcd_ek79007) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_ek79007/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_ek79007) |
83+
| [esp_lcd_gc9107](https://components.espressif.com/components/espressif/esp_lcd_gc9107) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_gc9107/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_gc9107) |
8284
| [esp_lcd_gc9b71](https://components.espressif.com/components/espressif/esp_lcd_gc9b71) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_gc9b71/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_gc9b71) |
85+
| [esp_lcd_gc9d01](https://components.espressif.com/components/espressif/esp_lcd_gc9d01) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_gc9d01/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_gc9d01) |
8386
| [esp_lcd_hx8399](https://components.espressif.com/components/espressif/esp_lcd_hx8399) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_hx8399/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_hx8399) |
8487
| [esp_lcd_jd9165](https://components.espressif.com/components/espressif/esp_lcd_jd9165) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_jd9165/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_jd9165) |
8588
| [esp_lcd_jd9365](https://components.espressif.com/components/espressif/esp_lcd_jd9365) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_jd9365/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_jd9365) |
8689
| [esp_lcd_nv3022b](https://components.espressif.com/components/espressif/esp_lcd_nv3022b) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_nv3022b/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_nv3022b) |
90+
| [esp_lcd_nv3052](https://components.espressif.com/components/espressif/esp_lcd_nv3052) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_nv3052/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_nv3052) |
8791
| [esp_lcd_panel_io_additions](https://components.espressif.com/components/espressif/esp_lcd_panel_io_additions) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_panel_io_additions/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_panel_io_additions) |
8892
| [esp_lcd_sh8601](https://components.espressif.com/components/espressif/esp_lcd_sh8601) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_sh8601/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_sh8601) |
8993
| [esp_lcd_spd2010](https://components.espressif.com/components/espressif/esp_lcd_spd2010) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_spd2010/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_spd2010) |

components/.build-rules.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@ components/display/lcd/esp_lcd_axs15231b/test_apps:
109109
enable:
110110
- if: INCLUDE_DEFAULT == 1
111111

112+
components/display/lcd/esp_lcd_co5300/test_apps:
113+
enable:
114+
- if: IDF_TARGET in ["esp32p4"]
115+
112116
components/display/lcd/esp_lcd_ek79007/test_apps:
113117
enable:
114118
- if: IDF_TARGET in ["esp32p4"]
@@ -121,10 +125,18 @@ components/display/lcd/esp_lcd_jd9365/test_apps:
121125
enable:
122126
- if: IDF_TARGET in ["esp32p4"]
123127

128+
components/display/lcd/esp_lcd_gc9107/test_apps:
129+
enable:
130+
- if: INCLUDE_DEFAULT == 1
131+
124132
components/display/lcd/esp_lcd_gc9b71/test_apps:
125133
enable:
126134
- if: INCLUDE_DEFAULT == 1
127135

136+
components/display/lcd/esp_lcd_gc9d01/test_apps:
137+
enable:
138+
- if: INCLUDE_DEFAULT == 1
139+
128140
components/display/lcd/esp_lcd_hx8399/test_apps:
129141
enable:
130142
- if: IDF_TARGET in ["esp32p4"]
@@ -137,6 +149,10 @@ components/display/lcd/esp_lcd_nv3022b/test_apps:
137149
enable:
138150
- if: INCLUDE_DEFAULT == 1
139151

152+
components/display/lcd/esp_lcd_nv3052/test_apps:
153+
enable:
154+
- if: IDF_TARGET in ["esp32s3", "esp32p4"]
155+
140156
components/display/lcd/esp_lcd_sh8601/test_apps:
141157
enable:
142158
- if: INCLUDE_DEFAULT == 1
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# ChangeLog
2+
3+
## v1.0.0 - 2025-07-16
4+
5+
### Enhancements:
6+
7+
* Implement the driver for the CO5300 LCD controller
8+
* Support SPI/QSPI interface
9+
* Support RGB interface
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
idf_component_register(SRCS "esp_lcd_co5300.c" "esp_lcd_co5300_spi.c" "esp_lcd_co5300_mipi.c"
2+
INCLUDE_DIRS "include"
3+
PRIV_INCLUDE_DIRS "priv_include"
4+
REQUIRES "esp_lcd" "driver")
5+
6+
include(package_manager)
7+
cu_pkg_define_version(${CMAKE_CURRENT_LIST_DIR})

0 commit comments

Comments
 (0)