Skip to content

Commit 04e05ad

Browse files
espressif2022espressif2022
committed
feat: fix CI compilation errors
1 parent 18c5d83 commit 04e05ad

File tree

28 files changed

+156
-1522
lines changed

28 files changed

+156
-1522
lines changed

‎.gitlab/ci/build.yml

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ build_example_matter_switch:
5151
image: espressif/esp-matter:latest_idf_v5.1.1
5252
variables:
5353
EXAMPLE_DIR: examples/matter_switch
54+
script:
55+
- pip install --upgrade "idf-component-manager~=1.2"
56+
- pip install "idf_build_apps<2.0"
57+
- python tools/build_apps.py ${EXAMPLE_DIR} --config ${EXAMPLE_CONFIG} -t esp32s3 -vv
5458

5559
build_example_chatgpt_demo:
5660
extends:
@@ -60,6 +64,9 @@ build_example_chatgpt_demo:
6064
matrix:
6165
- IMAGE: espressif/idf:release-v5.0
6266
- IMAGE: espressif/idf:release-v5.1
67+
- IMAGE: espressif/idf:release-v5.2
68+
- IMAGE: espressif/idf:release-v5.3
69+
- IMAGE: espressif/idf:release-v5.4
6370
- IMAGE: espressif/idf:latest
6471
variables:
6572
EXAMPLE_DIR: examples/chatgpt_demo
@@ -77,6 +84,9 @@ build_example_chatgpt_demo_factory_nvs:
7784
matrix:
7885
- IMAGE: espressif/idf:release-v5.0
7986
- IMAGE: espressif/idf:release-v5.1
87+
- IMAGE: espressif/idf:release-v5.2
88+
- IMAGE: espressif/idf:release-v5.3
89+
- IMAGE: espressif/idf:release-v5.4
8090
- IMAGE: espressif/idf:latest
8191
variables:
8292
EXAMPLE_DIR: examples/chatgpt_demo/factory_nvs
@@ -89,6 +99,9 @@ build_example_factory_demo:
8999
matrix:
90100
#- IMAGE: espressif/idf:release-v5.0 don't support release-v5.0 now.
91101
- IMAGE: espressif/idf:release-v5.1
102+
- IMAGE: espressif/idf:release-v5.2
103+
- IMAGE: espressif/idf:release-v5.3
104+
- IMAGE: espressif/idf:release-v5.4
92105
- IMAGE: espressif/idf:latest
93106
variables:
94107
EXAMPLE_DIR: examples/factory_demo
@@ -101,6 +114,9 @@ build_example_image_display:
101114
matrix:
102115
- IMAGE: espressif/idf:release-v5.0
103116
- IMAGE: espressif/idf:release-v5.1
117+
- IMAGE: espressif/idf:release-v5.2
118+
- IMAGE: espressif/idf:release-v5.3
119+
- IMAGE: espressif/idf:release-v5.4
104120
- IMAGE: espressif/idf:latest
105121
variables:
106122
EXAMPLE_DIR: examples/image_display
@@ -113,6 +129,9 @@ build_example_lv_demos:
113129
matrix:
114130
- IMAGE: espressif/idf:release-v5.0
115131
- IMAGE: espressif/idf:release-v5.1
132+
- IMAGE: espressif/idf:release-v5.2
133+
- IMAGE: espressif/idf:release-v5.3
134+
- IMAGE: espressif/idf:release-v5.4
116135
- IMAGE: espressif/idf:latest
117136
variables:
118137
EXAMPLE_DIR: examples/lv_demos
@@ -125,6 +144,9 @@ build_example_mp3_demo:
125144
matrix:
126145
- IMAGE: espressif/idf:release-v5.0
127146
- IMAGE: espressif/idf:release-v5.1
147+
- IMAGE: espressif/idf:release-v5.2
148+
- IMAGE: espressif/idf:release-v5.3
149+
- IMAGE: espressif/idf:release-v5.4
128150
- IMAGE: espressif/idf:latest
129151
variables:
130152
EXAMPLE_DIR: examples/mp3_demo
@@ -137,6 +159,9 @@ build_example_usb_camera_lcd_display:
137159
matrix:
138160
- IMAGE: espressif/idf:release-v5.0
139161
- IMAGE: espressif/idf:release-v5.1
162+
- IMAGE: espressif/idf:release-v5.2
163+
- IMAGE: espressif/idf:release-v5.3
164+
- IMAGE: espressif/idf:release-v5.4
140165
- IMAGE: espressif/idf:latest
141166
variables:
142167
EXAMPLE_DIR: examples/usb_camera_lcd_display
@@ -148,6 +173,10 @@ build_example_esp_joystick:
148173
parallel:
149174
matrix:
150175
- IMAGE: espressif/idf:release-v5.1
176+
- IMAGE: espressif/idf:release-v5.2
177+
- IMAGE: espressif/idf:release-v5.3
178+
- IMAGE: espressif/idf:release-v5.4
179+
- IMAGE: espressif/idf:latest
151180
variables:
152181
EXAMPLE_DIR: examples/esp_joystick
153182

@@ -157,8 +186,11 @@ build_example_usb_headset:
157186
- .rules:build:example_usb_headset
158187
parallel:
159188
matrix:
160-
- IMAGE: espressif/idf:release-v5.2
189+
- IMAGE: espressif/idf:release-v5.0
161190
- IMAGE: espressif/idf:release-v5.1
191+
- IMAGE: espressif/idf:release-v5.2
192+
- IMAGE: espressif/idf:release-v5.3
193+
- IMAGE: espressif/idf:release-v5.4
162194
- IMAGE: espressif/idf:latest
163195
variables:
164196
EXAMPLE_DIR: examples/usb_headset
@@ -171,6 +203,9 @@ build_example_watering_demo:
171203
matrix:
172204
- IMAGE: espressif/idf:release-v5.0
173205
- IMAGE: espressif/idf:release-v5.1
206+
- IMAGE: espressif/idf:release-v5.2
207+
- IMAGE: espressif/idf:release-v5.3
208+
- IMAGE: espressif/idf:release-v5.4
174209
- IMAGE: espressif/idf:latest
175210
variables:
176211
EXAMPLE_DIR: examples/watering_demo

‎.gitlab/ci/danger.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ include:
66

77
run-danger-mr-linter:
88
stage: pre_check
9+
# just ignore for now until the BOT_TOKEN is ready
10+
allow_failure: true
911
tags:
1012
- dangerjs

‎components/bsp/idf_component.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ dependencies:
55
public: true
66
version: "1.1.0"
77

8+
espressif/button:
9+
version: "^3.5.0"
10+
811
espressif/esp-box:
912
version: "3.0.*"
1013
require: "no"

‎components/bsp/src/boards/esp32_bsp_board.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -32,32 +32,32 @@ static const pmod_pins_t g_pmod[2] = {
3232

3333
static const board_res_desc_t g_board_box_res = {
3434

35-
.FUNC_SDMMC_EN = (1),
35+
.FUNC_SDMMC_EN = (1),
3636
.SDMMC_BUS_WIDTH = (4),
37-
.GPIO_SDMMC_CLK = (BSP_PMOD2_IO3),
38-
.GPIO_SDMMC_CMD = (BSP_PMOD2_IO2),
39-
.GPIO_SDMMC_D0 = (BSP_PMOD2_IO8),
40-
.GPIO_SDMMC_D1 = (BSP_PMOD2_IO4),
41-
.GPIO_SDMMC_D2 = (BSP_PMOD2_IO1),
42-
.GPIO_SDMMC_D3 = (BSP_PMOD2_IO5),
43-
.GPIO_SDMMC_DET = (GPIO_NUM_NC),
44-
45-
.FUNC_SDSPI_EN = (0),
46-
.SDSPI_HOST = (SPI2_HOST),
47-
.GPIO_SDSPI_CS = (GPIO_NUM_NC),
48-
.GPIO_SDSPI_SCLK = (GPIO_NUM_NC),
49-
.GPIO_SDSPI_MISO = (GPIO_NUM_NC),
50-
.GPIO_SDSPI_MOSI = (GPIO_NUM_NC),
51-
52-
.FUNC_SPI_EN = (0),
53-
.GPIO_SPI_CS = (GPIO_NUM_NC),
54-
.GPIO_SPI_MISO = (GPIO_NUM_NC),
55-
.GPIO_SPI_MOSI = (GPIO_NUM_NC),
56-
.GPIO_SPI_SCLK = (GPIO_NUM_NC),
57-
58-
.FUNC_RMT_EN = (0),
59-
.GPIO_RMT_IR = (GPIO_NUM_NC),
60-
.GPIO_RMT_LED = (GPIO_NUM_39),
37+
.GPIO_SDMMC_CLK = (BSP_PMOD2_IO3),
38+
.GPIO_SDMMC_CMD = (BSP_PMOD2_IO2),
39+
.GPIO_SDMMC_D0 = (BSP_PMOD2_IO8),
40+
.GPIO_SDMMC_D1 = (BSP_PMOD2_IO4),
41+
.GPIO_SDMMC_D2 = (BSP_PMOD2_IO1),
42+
.GPIO_SDMMC_D3 = (BSP_PMOD2_IO5),
43+
.GPIO_SDMMC_DET = (GPIO_NUM_NC),
44+
45+
.FUNC_SDSPI_EN = (0),
46+
.SDSPI_HOST = (SPI2_HOST),
47+
.GPIO_SDSPI_CS = (GPIO_NUM_NC),
48+
.GPIO_SDSPI_SCLK = (GPIO_NUM_NC),
49+
.GPIO_SDSPI_MISO = (GPIO_NUM_NC),
50+
.GPIO_SDSPI_MOSI = (GPIO_NUM_NC),
51+
52+
.FUNC_SPI_EN = (0),
53+
.GPIO_SPI_CS = (GPIO_NUM_NC),
54+
.GPIO_SPI_MISO = (GPIO_NUM_NC),
55+
.GPIO_SPI_MOSI = (GPIO_NUM_NC),
56+
.GPIO_SPI_SCLK = (GPIO_NUM_NC),
57+
58+
.FUNC_RMT_EN = (0),
59+
.GPIO_RMT_IR = (GPIO_NUM_NC),
60+
.GPIO_RMT_LED = (GPIO_NUM_39),
6161

6262
.PMOD1 = &g_pmod[0],
6363
.PMOD2 = &g_pmod[1],
@@ -87,7 +87,7 @@ esp_err_t bsp_btn_init(void)
8787
ESP_ERROR_CHECK((NULL != g_btn_handle));
8888

8989
int btn_num = 0;
90-
g_btn_handle = calloc(sizeof(button_handle_t), BSP_BUTTON_NUM);
90+
g_btn_handle = calloc(BSP_BUTTON_NUM, sizeof(button_handle_t));
9191
assert((g_btn_handle) && "memory is insufficient for button");
9292
return bsp_iot_button_create(g_btn_handle, &btn_num, BSP_BUTTON_NUM);
9393
}

‎examples/chatgpt_demo/main/app/app_sr.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Unlicense OR CC0-1.0
55
*/
@@ -99,11 +99,10 @@ static void audio_detect_task(void *arg)
9999
}
100100
afe_fetch_result_t *res = afe_handle->fetch(afe_data);
101101
if (!res || res->ret_value == ESP_FAIL) {
102-
ESP_LOGW(TAG, "AFE Fetch Fail");
103102
continue;
104103
}
105104
if (res->wakeup_state == WAKENET_DETECTED) {
106-
ESP_LOGI(TAG, LOG_BOLD(LOG_COLOR_GREEN) "wakeword detected");
105+
ESP_LOGI(TAG, "wakeword detected");
107106
sr_result_t result = {
108107
.wakenet_mode = WAKENET_DETECTED,
109108
.state = ESP_MN_STATE_DETECTING,
@@ -123,7 +122,7 @@ static void audio_detect_task(void *arg)
123122
}
124123
frame_keep = 0;
125124
g_sr_data->afe_handle->disable_wakenet(afe_data);
126-
ESP_LOGI(TAG, LOG_BOLD(LOG_COLOR_GREEN) "AFE_FETCH_CHANNEL_VERIFIED, channel index: %d\n", res->trigger_channel_id);
125+
ESP_LOGI(TAG, "AFE_FETCH_CHANNEL_VERIFIED, channel index: %d\n", res->trigger_channel_id);
127126
}
128127

129128
if (true == detect_flag) {

‎examples/esp_joystick/joystick_controller/main/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ file(GLOB_RECURSE SRC_UI ${CMAKE_SOURCE_DIR} "ui/*.c" "app/*.c")
44
idf_component_register(SRCS "joystick_controller_main.c" "app_ui_event.c" ${SRC_UI}
55
INCLUDE_DIRS "." "ui" "app")
66

7+
idf_component_get_property(lib espressif__esp-now COMPONENT_LIB)
8+
target_compile_options(${lib} PRIVATE -Wno-implicit-function-declaration)
9+
710
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-unused-const-variable)

‎examples/esp_joystick/joystick_rc_receiver/main/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ file(GLOB_RECURSE SRC_UI ${CMAKE_SOURCE_DIR} "espnow_ctrl/*.c")
44
idf_component_register(SRCS "joystick_rc_receiver_main.c" ${SRC_UI}
55
INCLUDE_DIRS "." "espnow_ctrl")
66

7+
idf_component_get_property(lib espressif__esp-now COMPONENT_LIB)
8+
target_compile_options(${lib} PRIVATE -Wno-implicit-function-declaration)
9+
710
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-unused-const-variable)

‎examples/factory_demo/components/espressif__esp_schedule/.component_hash

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/factory_demo/components/espressif__esp_schedule/CMakeLists.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)