Skip to content

Commit f3b1f33

Browse files
Lzw655Lzw655
committed
feat: update
1 parent d237d15 commit f3b1f33

File tree

10 files changed

+80
-41
lines changed

10 files changed

+80
-41
lines changed

‎.build-rules.yml

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

6-
# Componet test_apps
7-
test_apps:
8-
enable:
9-
- if: IDF_TARGET in ["esp32s3", "esp32p4"]
6+
# Test apps
7+
test_apps/lcd/3wire_spi_rgb:
8+
disable:
9+
- if: SOC_LCD_RGB_SUPPORTED != 1
10+
- if: IDF_TARGET == "esp32p4"
11+
temporary: true
12+
reason: not ready
1013

11-
# Examples
12-
examples/esp_idf/esp_brookesia_phone_m5stace_core_s3:
13-
enable:
14-
- if: IDF_TARGET in ["esp32s3"]
14+
test_apps/lcd/qspi:
15+
disable:
16+
- if: SOC_GPSPI_SUPPORTED != 1
1517

16-
examples/esp_idf/esp_brookesia_phone_p4_function_ev_board:
17-
enable:
18-
- if: IDF_TARGET in ["esp32p4"]
18+
test_apps/lcd/rgb:
19+
disable:
20+
- if: SOC_LCD_RGB_SUPPORTED != 1
21+
- if: IDF_TARGET == "esp32p4"
22+
temporary: true
23+
reason: not ready
1924

20-
examples/esp_idf/esp_brookesia_phone_s3_box:
21-
enable:
22-
- if: IDF_TARGET in ["esp32s3"]
25+
test_apps/lcd/spi:
26+
disable:
27+
- if: SOC_GPSPI_SUPPORTED != 1
2328

24-
examples/esp_idf/esp_brookesia_phone_s3_box_3:
29+
test_apps/panel:
2530
enable:
26-
- if: IDF_TARGET in ["esp32s3"]
31+
- if: INCLUDE_DEFAULT == 1
2732

28-
examples/esp_idf/esp_brookesia_phone_s3_lcd_ev_board:
29-
enable:
30-
- if: IDF_TARGET in ["esp32s3"]
33+
# Examples
34+
# examples/esp_idf/esp_brookesia_phone_m5stace_core_s3:
35+
# enable:
36+
# - if: IDF_TARGET in ["esp32s3"]

‎.github/scripts/check_lib_versions.sh

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ check_version_format() {
1515

1616
if [ $# -lt 1 ]; then
1717
latest_version="0.0.0"
18-
echo "Don't get the lastest version, use \"0.0.0\" as default"
18+
echo "Don't get the latest version, use \"0.0.0\" as default"
1919
else
2020
# Get the first input parameter as the version to be compared
2121
latest_version="$1"

‎.gitlab/ci/build.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,15 @@
4646
.build_idf_active_release_version:
4747
parallel:
4848
matrix:
49-
- IMAGE: espressif/idf:release-v5.0
5049
- IMAGE: espressif/idf:release-v5.1
5150
- IMAGE: espressif/idf:release-v5.2
5251
- IMAGE: espressif/idf:release-v5.3
5352

54-
.build_esp32_s3_idf_release_version:
55-
parallel:
56-
matrix:
57-
- IMAGE: espressif/idf:release-v5.1
58-
- IMAGE: espressif/idf:release-v5.2
59-
- IMAGE: espressif/idf:release-v5.3
60-
61-
.build_esp32_p4_idf_release_version:
62-
parallel:
63-
matrix:
64-
- IMAGE: espressif/idf:release-v5.3
65-
6653
# Test apps
6754
build_test_apps_lcd_3wire_spi_rgb:
6855
extends:
6956
- .build_examples_template
70-
- .build_esp32_s3_idf_release_version
57+
- .build_idf_active_release_version
7158
- .rules:build:test_apps_lcd_3wire_spi_rgb
7259
variables:
7360
EXAMPLE_DIR: test_apps/lcd/3wire_spi_rgb
@@ -83,7 +70,7 @@ build_test_apps_lcd_qspi:
8370
build_test_apps_lcd_rgb:
8471
extends:
8572
- .build_examples_template
86-
- .build_esp32_s3_idf_release_version
73+
- .build_idf_active_release_version
8774
- .rules:build:test_apps_lcd_rgb
8875
variables:
8976
EXAMPLE_DIR: test_apps/lcd/rgb
@@ -96,6 +83,14 @@ build_test_apps_lcd_spi:
9683
variables:
9784
EXAMPLE_DIR: test_apps/lcd/spi
9885

86+
build_test_apps_panel:
87+
extends:
88+
- .build_examples_template
89+
- .build_idf_active_release_version
90+
- .rules:build:test_apps_panel
91+
variables:
92+
EXAMPLE_DIR: test_apps/panel
93+
9994
# Examples
10095
# build_example_esp_brookesia_phone_m5stace_core_s3:
10196
# extends:

‎.gitlab/ci/rules.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,17 @@
7575
.if_label-deploy: &if-label-deploy
7676
if: '$BOT_LABEL_DEPLOY || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*deploy(?:,[^,\n\r]+)*$/i'
7777

78+
# rules for readme
79+
.rules:pre_check:readme:
80+
rules:
81+
- <<: *if-protected
82+
- <<: *if-label-pre_check
83+
- <<: *if-trigger-job
84+
- <<: *if-dev-push
85+
changes: *patterns-docs_md
86+
- <<: *if-dev-push
87+
changes: *patterns-build_system
88+
7889
# rules for test_apps
7990
.rules:build:test_apps_lcd_3wire_spi_rgb:
8091
rules:

‎.gitlab/tools/check_readme_links.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,20 @@
2121
EXCLUDE_DOCS_LIST = []
2222

2323
# The apple apps links are not accessible from the company network for some reason
24-
EXCLUDE_URL_LIST = ['https://squareline.io/']
24+
EXCLUDE_URL_LIST = [
25+
'https://squareline.io/',
26+
'https://m5stack.com/',
27+
'https://docs.m5stack.com/en/core/CoreS3',
28+
'https://docs.m5stack.com/en/core/M5Dial',
29+
'https://docs.m5stack.com/en/core/M5Dial',
30+
'https://img.shields.io/github/v/release/esp-arduino-libs/ESP32_Display_Panel',
31+
'https://www.displaysmodule.com/sale-41828962-experience-the-power-of-the-esp32-display-module-sku-esp32-4848s040c-i-y-3.html',
32+
'https://www.displaysmodule.com/',
33+
'https://www.waveshare.com/',
34+
'https://www.waveshare.com/esp32-s3-touch-lcd-4.3.htm',
35+
'https://www.waveshare.com/esp32-s3-touch-lcd-2.1.htm',
36+
'https://www.waveshare.com/esp32-s3-touch-lcd-1.85.htm',
37+
]
2538

2639
Link = namedtuple('Link', ['file', 'url'])
2740

@@ -128,7 +141,8 @@ def check_readme_links(args: argparse.Namespace) -> int:
128141
file_links.append(link)
129142

130143
for url in EXCLUDE_URL_LIST:
131-
del web_links[url]
144+
if url in web_links:
145+
del web_links[url]
132146

133147
errors.extend(check_file_links(file_links))
134148

‎examples/PlatformIO/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Follow the steps below to configure:
1717
2. For **lvgl**:
1818

1919
- Follow the [steps](../../README.md#configuring-lvgl) to add *lv_conf.h* file and change the configurations.
20-
- Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
20+
- Modify the macros in the [lvgl_port_v8.h](./src/lvgl_port_v8.h) file to configure the LVGL porting parameters.
2121

2222
3. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters. For supported boards, please refter to [Configuring Supported Development Boards](../../README.md#configuring-supported-development-boards)
2323
4. Verify and upload the example to your ESP board.

‎idf_component.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ dependencies:
77
idf: ">=5.1"
88
esp-arduino-libs/esp-io-expander:
99
git: https://github.com/esp-arduino-libs/ESP32_IO_Expander.git
10+
public: true

‎src/touch/base/esp_lcd_touch.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ struct esp_lcd_touch_s {
150150
* @param max_point_num: Maximum count of touched points to return (equals with max size of x and y array)
151151
*
152152
* @return
153-
* - Returns true, when touched and coordinates readed. Otherwise returns false.
153+
* - Returns true, when touched and coordinates read. Otherwise returns false.
154154
*/
155155
bool (*get_xy)(esp_lcd_touch_handle_t tp, uint16_t *x, uint16_t *y, uint16_t *strength, uint8_t *point_num, uint8_t max_point_num);
156156

@@ -164,7 +164,7 @@ struct esp_lcd_touch_s {
164164
* @param state: Button state
165165
*
166166
* @return
167-
* - Returns true, when touched and coordinates readed. Otherwise returns false.
167+
* - Returns true, when touched and coordinates read. Otherwise returns false.
168168
*/
169169
esp_err_t (*get_button_state)(esp_lcd_touch_handle_t tp, uint8_t n, uint8_t *state);
170170
#endif
@@ -291,7 +291,7 @@ esp_err_t esp_lcd_touch_read_data(esp_lcd_touch_handle_t tp);
291291
* @param max_point_num: Maximum count of touched points to return (equals with max size of x and y array)
292292
*
293293
* @return
294-
* - Returns true, when touched and coordinates readed. Otherwise returns false.
294+
* - Returns true, when touched and coordinates read. Otherwise returns false.
295295
*/
296296
bool esp_lcd_touch_get_coordinates(esp_lcd_touch_handle_t tp, uint16_t *x, uint16_t *y, uint16_t *strength, uint8_t *point_num, uint8_t max_point_num);
297297

‎test_apps/panel/sdkconfig.ci.espressif_esp32_c3_lcdkit

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CONFIG_IDF_TARGET="esp32c3"
2+
CONFIG_BOARD_MANUFACTURER_ESPRESSIF=y
3+
CONFIG_BOARD_ESP32_C3_LCDKIT=y

‎test_apps/panel/sdkconfig.ci.espressif_esp32_s3_box

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
CONFIG_IDF_TARGET="esp32s3"
2+
CONFIG_BOARD_MANUFACTURER_ESPRESSIF=y
3+
CONFIG_BOARD_ESP32_S3_BOX=y
4+
5+
CONFIG_SPIRAM=y
6+
CONFIG_SPIRAM_MODE_OCT=y
7+
CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y
8+
CONFIG_SPIRAM_RODATA=y
9+
CONFIG_SPIRAM_SPEED_80M=y

0 commit comments

Comments
 (0)