Skip to content

Commit a5007cc

Browse files
Lzw655Lzw655
committed
Merge branch 'feat/refactor_and_support_micropython' into 'master'
feat(repo): release v1.0.0 Closes #137 See merge request ae_group/ESP32_Display_Panel!10
2 parents 32cdcee + c845145 commit a5007cc

File tree

991 files changed

+82989
-37699
lines changed

Some content is hidden

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

991 files changed

+82989
-37699
lines changed

‎.build-rules.yml

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,71 @@
44
# * (A == 1 and B == 2) or (C not in ["3", "4", 5])
55

66
# Test apps
7-
test_apps/lcd/3wire_spi_rgb:
7+
# Board
8+
test_apps/board/common:
9+
enable:
10+
- if: INCLUDE_DEFAULT == 1
11+
12+
test_apps/board/elecrow:
13+
enable:
14+
- if: INCLUDE_DEFAULT == 1
15+
16+
test_apps/board/espressif:
17+
enable:
18+
- if: INCLUDE_DEFAULT == 1
19+
20+
test_apps/board/jingcai:
21+
enable:
22+
- if: INCLUDE_DEFAULT == 1
23+
24+
test_apps/board/m5stack:
25+
enable:
26+
- if: INCLUDE_DEFAULT == 1
27+
28+
test_apps/board/viewe:
29+
enable:
30+
- if: INCLUDE_DEFAULT == 1
31+
32+
test_apps/board/waveshare:
33+
enable:
34+
- if: INCLUDE_DEFAULT == 1
35+
36+
# Drivers
37+
test_apps/drivers/lcd/3wire_spi_rgb:
838
disable:
939
- if: SOC_LCD_RGB_SUPPORTED != 1
1040
- if: IDF_TARGET == "esp32p4"
1141
temporary: true
1242
reason: not ready
1343

14-
test_apps/lcd/qspi:
44+
test_apps/drivers/lcd/qspi:
1545
disable:
1646
- if: SOC_GPSPI_SUPPORTED != 1
1747

18-
test_apps/lcd/mipi_dsi:
48+
test_apps/drivers/lcd/mipi_dsi:
1949
disable:
2050
- if: SOC_MIPI_DSI_SUPPORTED != 1
2151

22-
test_apps/lcd/rgb:
52+
test_apps/drivers/lcd/rgb:
2353
disable:
2454
- if: SOC_LCD_RGB_SUPPORTED != 1
2555
- if: IDF_TARGET == "esp32p4"
2656
temporary: true
2757
reason: not ready
2858

29-
test_apps/lcd/spi:
59+
test_apps/drivers/lcd/spi:
3060
disable:
3161
- if: SOC_GPSPI_SUPPORTED != 1
3262

33-
test_apps/lvgl_port:
34-
enable:
35-
- if: INCLUDE_DEFAULT == 1
36-
37-
test_apps/panel:
38-
enable:
39-
- if: INCLUDE_DEFAULT == 1
40-
41-
test_apps/touch/i2c:
63+
test_apps/drivers/touch/i2c:
4264
disable:
4365
- if: SOC_I2C_SUPPORTED != 1
4466

45-
test_apps/touch/spi:
67+
test_apps/drivers/touch/spi:
4668
disable:
4769
- if: SOC_GPSPI_SUPPORTED != 1
4870

4971
# Examples
50-
# examples/esp_idf/esp_brookesia_phone_m5stace_core_s3:
51-
# enable:
52-
# - if: IDF_TARGET in ["esp32s3"]
72+
test_apps/gui/lvgl_v8_port:
73+
enable:
74+
- if: INCLUDE_DEFAULT == 1

‎.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[codespell]
2-
skip = ./src/touch/base/esp_lcd_touch_xpt2046.c
2+
skip = ./src/touch/port/esp_lcd_touch_xpt2046.c,

‎.github/workflows/upload_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
- name: Upload components to component service
1616
uses: espressif/upload-components-ci-action@v1
1717
with:
18-
name: "ESP32_Display_Panel"
18+
name: "esp32_display_panel"
1919
namespace: "espressif"
2020
api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}

‎.gitlab/ci/build.yml

Lines changed: 59 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
- python .gitlab/tools/build_apps.py ${EXAMPLE_DIR} --config ${EXAMPLE_CONFIG} -t all -vv
4444

4545
# Images for different target ESP-IDF
46-
.build_idf_active_release_image:
46+
.build_general_idf_release_image:
4747
parallel:
4848
matrix:
4949
- IMAGE: espressif/idf:release-v5.1
@@ -57,170 +57,118 @@
5757
- IMAGE: espressif/idf:release-v5.3
5858
- IMAGE: espressif/idf:release-v5.4
5959

60-
# Test apps common
61-
build_test_apps_common:
62-
extends:
63-
- .build_examples_template
64-
- .build_idf_active_release_image
65-
- .rules:build:test_apps_common
66-
variables:
67-
EXAMPLE_DIR: test_apps/common
68-
6960
# Test apps lcd
70-
build_test_apps_lcd_3wire_spi_rgb:
61+
build_test_apps_drivers_lcd_3wire_spi_rgb:
7162
extends:
7263
- .build_examples_template
73-
- .build_idf_active_release_image
74-
- .rules:build:test_apps_lcd_3wire_spi_rgb
64+
- .build_general_idf_release_image
65+
- .rules:build:test_apps_drivers_lcd_3wire_spi_rgb
7566
variables:
76-
EXAMPLE_DIR: test_apps/lcd/3wire_spi_rgb
67+
EXAMPLE_DIR: test_apps/drivers/lcd/3wire_spi_rgb
7768

78-
build_test_apps_lcd_mipi_dsi:
69+
build_test_apps_drivers_lcd_mipi_dsi:
7970
extends:
8071
- .build_examples_template
8172
- .build_esp32_p4_idf_release_image
82-
- .rules:build:test_apps_lcd_mipi_dsi
73+
- .rules:build:test_apps_drivers_lcd_mipi_dsi
8374
variables:
84-
EXAMPLE_DIR: test_apps/lcd/mipi_dsi
75+
EXAMPLE_DIR: test_apps/drivers/lcd/mipi_dsi
8576

86-
build_test_apps_lcd_qspi:
77+
build_test_apps_drivers_lcd_qspi:
8778
extends:
8879
- .build_examples_template
89-
- .build_idf_active_release_image
90-
- .rules:build:test_apps_lcd_qspi
80+
- .build_general_idf_release_image
81+
- .rules:build:test_apps_drivers_lcd_qspi
9182
variables:
92-
EXAMPLE_DIR: test_apps/lcd/qspi
83+
EXAMPLE_DIR: test_apps/drivers/lcd/qspi
9384

94-
build_test_apps_lcd_rgb:
85+
build_test_apps_drivers_lcd_rgb:
9586
extends:
9687
- .build_examples_template
97-
- .build_idf_active_release_image
98-
- .rules:build:test_apps_lcd_rgb
88+
- .build_general_idf_release_image
89+
- .rules:build:test_apps_drivers_lcd_rgb
9990
variables:
100-
EXAMPLE_DIR: test_apps/lcd/rgb
91+
EXAMPLE_DIR: test_apps/drivers/lcd/rgb
10192

102-
build_test_apps_lcd_spi:
93+
build_test_apps_drivers_lcd_spi:
10394
extends:
10495
- .build_examples_template
105-
- .build_idf_active_release_image
106-
- .rules:build:test_apps_lcd_spi
96+
- .build_general_idf_release_image
97+
- .rules:build:test_apps_drivers_lcd_spi
10798
variables:
108-
EXAMPLE_DIR: test_apps/lcd/spi
99+
EXAMPLE_DIR: test_apps/drivers/lcd/spi
109100

110-
# Test apps lvgl_port
111-
build_test_apps_lvgl_port_elecrow:
112-
extends:
113-
- .build_examples_template
114-
- .build_idf_active_release_image
115-
- .rules:build:test_apps_lvgl_port_board_elecrow
116-
variables:
117-
EXAMPLE_DIR: test_apps/lvgl_port
118-
EXAMPLE_CONFIG: sdkconfig.elecrow.*
119-
120-
build_test_apps_lvgl_port_espressif:
121-
extends:
122-
- .build_examples_template
123-
- .build_idf_active_release_image
124-
- .rules:build:test_apps_lvgl_port_board_espressif
125-
variables:
126-
EXAMPLE_DIR: test_apps/lvgl_port
127-
EXAMPLE_CONFIG: sdkconfig.espressif.*
128-
129-
build_test_apps_lvgl_port_jingcai:
101+
# Test apps touch
102+
build_test_apps_drivers_touch_i2c:
130103
extends:
131104
- .build_examples_template
132-
- .build_idf_active_release_image
133-
- .rules:build:test_apps_lvgl_port_board_jingcai
105+
- .build_general_idf_release_image
106+
- .rules:build:test_apps_drivers_touch_i2c
134107
variables:
135-
EXAMPLE_DIR: test_apps/lvgl_port
136-
EXAMPLE_CONFIG: sdkconfig.jingcai.*
108+
EXAMPLE_DIR: test_apps/drivers/touch/i2c
137109

138-
build_test_apps_lvgl_port_m5stack:
110+
build_test_apps_drivers_touch_spi:
139111
extends:
140112
- .build_examples_template
141-
- .build_idf_active_release_image
142-
- .rules:build:test_apps_lvgl_port_board_m5stack
113+
- .build_general_idf_release_image
114+
- .rules:build:test_apps_drivers_touch_spi
143115
variables:
144-
EXAMPLE_DIR: test_apps/lvgl_port
145-
EXAMPLE_CONFIG: sdkconfig.m5stack.*
116+
EXAMPLE_DIR: test_apps/drivers/touch/spi
146117

147-
build_test_apps_lvgl_port_waveshare:
118+
# Test apps board
119+
build_test_apps_board_common:
148120
extends:
149121
- .build_examples_template
150-
- .build_idf_active_release_image
151-
- .rules:build:test_apps_lvgl_port_board_waveshare
122+
- .build_general_idf_release_image
123+
- .rules:build:test_apps_board_common
152124
variables:
153-
EXAMPLE_DIR: test_apps/lvgl_port
154-
EXAMPLE_CONFIG: sdkconfig.waveshare.*
125+
EXAMPLE_DIR: test_apps/board/common
155126

156-
# Test apps panel
157-
build_test_apps_panel_elecrow:
127+
build_test_apps_board_elecrow:
158128
extends:
159129
- .build_examples_template
160-
- .build_idf_active_release_image
161-
- .rules:build:test_apps_panel_board_elecrow
130+
- .build_general_idf_release_image
131+
- .rules:build:test_apps_board_elecrow
162132
variables:
163-
EXAMPLE_DIR: test_apps/panel
164-
EXAMPLE_CONFIG: sdkconfig.elecrow.*
133+
EXAMPLE_DIR: test_apps/board/elecrow
165134

166-
build_test_apps_panel_espressif:
135+
build_test_apps_board_espressif:
167136
extends:
168137
- .build_examples_template
169-
- .build_idf_active_release_image
170-
- .rules:build:test_apps_panel_board_espressif
138+
- .build_general_idf_release_image
139+
- .rules:build:test_apps_board_espressif
171140
variables:
172-
EXAMPLE_DIR: test_apps/panel
173-
EXAMPLE_CONFIG: sdkconfig.espressif.*
141+
EXAMPLE_DIR: test_apps/board/espressif
174142

175-
build_test_apps_panel_jingcai:
143+
build_test_apps_board_jingcai:
176144
extends:
177145
- .build_examples_template
178-
- .build_idf_active_release_image
179-
- .rules:build:test_apps_panel_board_jingcai
146+
- .build_general_idf_release_image
147+
- .rules:build:test_apps_board_jingcai
180148
variables:
181-
EXAMPLE_DIR: test_apps/panel
182-
EXAMPLE_CONFIG: sdkconfig.jingcai.*
149+
EXAMPLE_DIR: test_apps/board/jingcai
183150

184-
build_test_apps_panel_m5stack:
151+
build_test_apps_board_m5stack:
185152
extends:
186153
- .build_examples_template
187-
- .build_idf_active_release_image
188-
- .rules:build:test_apps_panel_board_m5stack
154+
- .build_general_idf_release_image
155+
- .rules:build:test_apps_board_m5stack
189156
variables:
190-
EXAMPLE_DIR: test_apps/panel
191-
EXAMPLE_CONFIG: sdkconfig.m5stack.*
157+
EXAMPLE_DIR: test_apps/board/m5stack
192158

193-
build_test_apps_panel_waveshare:
159+
build_test_apps_board_waveshare:
194160
extends:
195161
- .build_examples_template
196-
- .build_idf_active_release_image
197-
- .rules:build:test_apps_panel_board_waveshare
162+
- .build_general_idf_release_image
163+
- .rules:build:test_apps_board_waveshare
198164
variables:
199-
EXAMPLE_DIR: test_apps/panel
200-
EXAMPLE_CONFIG: sdkconfig.waveshare.*
165+
EXAMPLE_DIR: test_apps/board/waveshare
201166

202-
# Test apps touch
203-
build_test_apps_touch_i2c:
167+
# Test apps examples
168+
build_test_apps_gui_lvgl_v8_port:
204169
extends:
205170
- .build_examples_template
206-
- .build_idf_active_release_image
207-
- .rules:build:test_apps_touch_i2c
171+
- .build_general_idf_release_image
172+
- .rules:build:test_apps_gui_lvgl_v8_port
208173
variables:
209-
EXAMPLE_DIR: test_apps/touch/i2c
210-
211-
build_test_apps_touch_spi:
212-
extends:
213-
- .build_examples_template
214-
- .build_idf_active_release_image
215-
- .rules:build:test_apps_touch_spi
216-
variables:
217-
EXAMPLE_DIR: test_apps/touch/spi
218-
219-
# Examples
220-
# build_example_esp_brookesia_phone_m5stace_core_s3:
221-
# extends:
222-
# - .build_examples_template
223-
# - .build_esp32_s3_idf_release_image
224-
# - .rules:build:example_esp_brookesia_phone_m5stace_core_s3
225-
# variables:
226-
# EXAMPLE_DIR: examples/esp_idf/esp_brookesia_phone_m5stace_core_s3
174+
EXAMPLE_DIR: test_apps/gui/lvgl_v8_port

0 commit comments

Comments
 (0)