Skip to content

Commit a9dbe7a

Browse files
espressif2022espressif2022
committed
feat: update some component
1 parent de1e12c commit a9dbe7a

File tree

19 files changed

+185
-85
lines changed

19 files changed

+185
-85
lines changed

‎.gitlab/ci/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,6 +1082,7 @@ build_components_display_tools_esp_mmap_assets_test_apps:
10821082
- .rules:build:components_display_tools_esp_mmap_assets_test_apps
10831083
parallel:
10841084
matrix:
1085+
- IMAGE: espressif/idf:release-v5.3
10851086
- IMAGE: espressif/idf:release-v5.1
10861087
- IMAGE: espressif/idf:release-v5.0
10871088
variables:

‎.gitlab/ci/rules.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@
8282
.patterns-components_display_lcd_esp_lcd_jd9365: &patterns-components_display_lcd_esp_lcd_jd9365
8383
- "components/display/lcd/esp_lcd_jd9365/**/*"
8484

85-
.patterns-components_display_lcd_esp_lcd_axs15231b: &patterns-components_display_lcd_esp_lcd_axs15231b
86-
- "components/display/lcd/esp_lcd_axs15231b/**/*"
87-
8885
.patterns-components_display_lcd_esp_lcd_gc9b71: &patterns-components_display_lcd_esp_lcd_gc9b71
8986
- "components/display/lcd/esp_lcd_gc9b71/**/*"
9087

‎.gitlab/ci/target_test.yml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ variables:
22
# There is no target-test-env-v4.4
33
DOCKER_TARGET_TEST_v5_0_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.0:3"
44
DOCKER_TARGET_TEST_v5_1_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.1:1"
5+
DOCKER_TARGET_TEST_v5_4_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.4:1"
56

67
.test_template: &test_template
78
image: DOCKER_TARGET_TEST_v5_0_ENV_IMAGE
@@ -310,6 +311,26 @@ components_test_openai:
310311
TEST_TARGET: esp32s3
311312
TEST_FOLDER: components/openai
312313

314+
components_test_esp_lcd_axs15231b:
315+
extends:
316+
- .pytest_template
317+
- .rules:build:components_display_lcd_esp_lcd_axs15231b_test_apps
318+
needs:
319+
- job: "build_components_display_lcd_esp_lcd_axs15231b_test_apps"
320+
artifacts: true
321+
optional: false
322+
parallel:
323+
matrix:
324+
- IDF_VERSION: "5.1"
325+
tags:
326+
- esp32s3
327+
- esp32s3_lcd_ev
328+
image: $DOCKER_TARGET_TEST_v5_1_ENV_IMAGE
329+
variables:
330+
TEST_TARGET: esp32s3
331+
TEST_FOLDER: components/display/lcd/esp_lcd_axs15231b
332+
TEST_ENV: esp32_s3_lcd_ev_board
333+
313334
components_test_esp_lcd_gc9b71:
314335
extends:
315336
- .pytest_template
@@ -506,10 +527,13 @@ components_test_esp_mmap_assets:
506527
- IDF_TARGET: esp32s3
507528
IDF_VERSION: "5.1"
508529
ENV_TAG: generic
530+
- IDF_TARGET: esp32p4
531+
IDF_VERSION: "5.3"
532+
ENV_TAG: generic
509533
tags:
510534
- ${IDF_TARGET}
511535
- ${ENV_TAG}
512-
image: $DOCKER_TARGET_TEST_v5_1_ENV_IMAGE
536+
image: $DOCKER_TARGET_TEST_v5_4_ENV_IMAGE
513537
variables:
514538
TEST_TARGET: ${IDF_TARGET}
515539
TEST_FOLDER: components/display/tools/esp_mmap_assets

‎components/display/lcd/esp_lcd_axs15231b/idf_component.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1+
version: "1.0.0"
2+
description: ESP LCD & Touch AXS15231B
3+
url: https://github.com/espressif/esp-bsp/tree/master/components/lcd/esp_lcd_axs15231b
4+
issues: https://github.com/espressif/esp-iot-solution/issues
5+
repository: https://github.com/espressif/esp-iot-solution.git
16
dependencies:
27
esp_lcd_touch:
38
public: true
49
version: '^1'
510
idf: ">5.0.4,!=5.1.1"
6-
cmake_utilities:
7-
version: '0.*'
8-
description: ESP LCD & Touch AXS15231B
9-
url: https://github.com/espressif/esp-bsp/tree/master/components/lcd/esp_lcd_axs15231b
10-
version: 1.0.0
11-
sbom:
12-
supplier: 'Organization: Espressif Systems (Shanghai) CO LTD'
13-
originator: 'Organization: Espressif Systems (Shanghai) CO LTD'
11+
cmake_utilities: "0.*"

‎components/display/lcd/esp_lcd_axs15231b/test_apps/pytest_esp_lcd_axs15231b.py‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
2+
# SPDX-License-Identifier: Apache-2.0
3+
import pytest
4+
from pytest_embedded import Dut
5+
6+
@pytest.mark.target('esp32s3')
7+
@pytest.mark.env('esp32_s3_lcd_ev_board')
8+
def test_esp_lcd_axs15231b_i80(dut: Dut)-> None:
9+
dut.expect_exact('Press ENTER to see the list of tests.')
10+
dut.write('[I80]')
11+
dut.expect_unity_test_output(timeout = 1000)
12+
13+
@pytest.mark.target('esp32s3')
14+
@pytest.mark.env('esp32_s3_lcd_ev_board')
15+
def test_esp_lcd_axs15231b_spi(dut: Dut)-> None:
16+
dut.expect_exact('Press ENTER to see the list of tests.')
17+
dut.write('[spi]')
18+
dut.expect_unity_test_output(timeout = 1000)
19+
20+
@pytest.mark.target('esp32s3')
21+
@pytest.mark.env('esp32_s3_lcd_ev_board')
22+
def test_esp_lcd_axs15231b_qspi(dut: Dut)-> None:
23+
dut.expect_exact('Press ENTER to see the list of tests.')
24+
dut.write('[qspi]')
25+
dut.expect_unity_test_output(timeout = 1000)

‎components/display/lcd/esp_lcd_axs15231b/test_apps/sdkconfig.defaults‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ CONFIG_IDF_TARGET="esp32s3"
1010
CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y
1111
CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y
1212
CONFIG_ESP_TASK_WDT=n
13-
14-
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y

‎components/display/tools/esp_lv_fs/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# ChangeLog
22

3+
## v1.0.0 Initial Version (2024-11-7)
4+
5+
* Add v9 support.
6+
37
## v0.1.0 Initial Version (2024-07-29)
48

59
* Dependence on esp_mmap_assets to build filesystem for LVGL.

‎components/display/tools/esp_lv_fs/esp_lv_fs.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7+
#include <string.h>
78
#include "esp_log.h"
89
#include "esp_check.h"
910
#include "esp_lv_fs.h"
@@ -155,7 +156,11 @@ static void *fs_dir_open(lv_fs_drv_t *drv, const char *path)
155156
return NULL;
156157
}
157158

159+
#if LVGL_VERSION_MAJOR >= 9
160+
static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn, uint32_t fn_len)
161+
#else
158162
static lv_fs_res_t fs_dir_read(lv_fs_drv_t *drv, void *dir_p, char *fn)
163+
#endif
159164
{
160165
LV_UNUSED(drv);
161166
// Return an error indicating that write operations are not supported

‎components/display/tools/esp_lv_fs/idf_component.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "0.1.0"
1+
version: "1.0.0"
22
targets:
33
- esp32
44
- esp32c2
@@ -7,6 +7,7 @@ targets:
77
- esp32h2
88
- esp32s2
99
- esp32s3
10+
- esp32p4
1011
description: File system for LVGL, supports reading files directly from flash.
1112
url: https://github.com/espressif/esp-iot-solution/tree/master/components/display/tools/esp_lv_fs
1213
issues: https://github.com/espressif/esp-iot-solution/issues

‎components/ir/ir_learn/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# ChangeLog
22

3+
## v1.0.0 - 2024-08-09
4+
5+
* Update README
6+
37
## v0.2.0 - 2024-01-26
48

59
* Optimize the structure definition

0 commit comments

Comments
 (0)