Skip to content

Commit d9191d2

Browse files
SoucheSoucheSoucheSouche
authored
Merge branch 'master' into feat/add-command-manager-component
2 parents b47ee2d + 9dffeba commit d9191d2

36 files changed

+3140
-52
lines changed

‎.build-test-rules.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ esp_jpeg/examples/get_started:
3434
- if: IDF_VERSION_MAJOR > 4 and IDF_TARGET in ["esp32", "esp32s2", "esp32s3"]
3535
reason: Example depends on BSP, which is supported only for IDF >= 5.0 and limited targets
3636

37+
esp_schedule/examples/get_started:
38+
enable:
39+
- if: ((IDF_VERSION_MAJOR == 5 and IDF_VERSION_MINOR >= 1) or (IDF_VERSION_MAJOR > 5)) and SOC_WIFI_SUPPORTED == 1
40+
reason: Network provisioning component has dependencies IDF >= 5.1; example only supports Wi-Fi enabled targets
41+
3742
catch2/examples/catch2-test:
3843
enable:
3944
- if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux"

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ body:
3939
- esp_isotp
4040
- esp_jpeg
4141
- esp_lcd_qemu_rgb
42+
- esp_schedule
4243
- esp_serial_slave_link
4344
- expat
4445
- fmt

‎.github/workflows/upload_component.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
esp_lcd_qemu_rgb
4444
esp_linenoise
4545
esp_jpeg
46+
esp_schedule
4647
esp_serial_slave_link
4748
expat
4849
fmt

‎.idf_build_apps.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ manifest_file = [
1414
"esp_gcov/.build-test-rules.yml",
1515
"esp_jpeg/.build-test-rules.yml",
1616
"esp_linenoise/.build-test-rules.yml",
17+
"esp_schedule/.build-test-rules.yml",
1718
"esp_serial_slave_link/.build-test-rules.yml",
1819
"expat/.build-test-rules.yml",
1920
"iqmath/.build-test-rules.yml",

‎coap/sbom_libcoap.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ cve-exclude-list:
1212
reason: Resolved in version 4.3.5-rc1
1313
- cve: CVE-2024-46304
1414
reason: Resolved in version 4.3.5-rc3
15+
- cve: CVE-2025-50518
16+
reason: Not applicable as per comment https://github.com/obgm/libcoap/issues/1724#issuecomment-3296780541

‎esp_gcov/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ if(CONFIG_ESP_GCOV_ENABLE)
5959

6060
# Register component with app_trace dependency
6161
idf_component_register(SRCS "gcov_rtio.c"
62-
REQUIRES "app_trace"
62+
REQUIRES "esp_trace"
6363
INCLUDE_DIRS ".")
6464

6565
# Configure gcov-specific flags
@@ -74,6 +74,6 @@ if(CONFIG_ESP_GCOV_ENABLE)
7474

7575
else()
7676
# Register empty component when GCOV is disabled
77-
idf_component_register(REQUIRES "app_trace")
77+
idf_component_register(REQUIRES "esp_trace")
7878
message(STATUS "GCOV: Component registered but GCOV support is disabled")
7979
endif()

‎esp_gcov/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ menu "GNU Code Coverage"
22

33
config ESP_GCOV_ENABLE
44
bool "GCOV to Host Enable"
5-
depends on APPTRACE_ENABLE && !APPTRACE_SV_ENABLE
5+
depends on ESP_TRACE_TRANSPORT_APPTRACE && ESP_TRACE_LIB_NONE
66
select ESP_DEBUG_STUBS_ENABLE
77
select ESP_IPC_ENABLE
8-
default y
8+
default n
99
help
1010
Enables support for GCOV data transfer to host.
1111

‎esp_gcov/gcov_rtio.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void gcov_dump_task(void *pvParameter)
3939
goto gcov_exit;
4040
}
4141
ESP_EARLY_LOGV(TAG, "Config apptrace down buf");
42-
esp_err_t res = esp_apptrace_down_buffer_config(ESP_APPTRACE_DEST_JTAG, down_buf, ESP_GCOV_DOWN_BUF_SIZE);
42+
esp_err_t res = esp_apptrace_down_buffer_config(down_buf, ESP_GCOV_DOWN_BUF_SIZE);
4343
if (res != ESP_OK) {
4444
ESP_EARLY_LOGE(TAG, "Failed to config apptrace down buf (%d)!", res);
4545
dump_result = res;
@@ -51,7 +51,7 @@ void gcov_dump_task(void *pvParameter)
5151
__gcov_reset();
5252
free(down_buf);
5353
ESP_EARLY_LOGV(TAG, "Finish file transfer session");
54-
dump_result = esp_apptrace_fstop(ESP_APPTRACE_DEST_JTAG);
54+
dump_result = esp_apptrace_fstop();
5555
if (dump_result != ESP_OK) {
5656
ESP_EARLY_LOGE(TAG, "Failed to send files transfer stop cmd (%d)!", dump_result);
5757
}
@@ -117,7 +117,7 @@ void esp_gcov_dump(void)
117117
{
118118
ESP_EARLY_LOGV(TAG, "%s", __FUNCTION__);
119119

120-
while (!esp_apptrace_host_is_connected(ESP_APPTRACE_DEST_JTAG)) {
120+
while (!esp_apptrace_host_is_connected()) {
121121
vTaskDelay(pdMS_TO_TICKS(10));
122122
}
123123

@@ -132,48 +132,48 @@ void esp_gcov_dump(void)
132132
void *gcov_rtio_fopen(const char *path, const char *mode)
133133
{
134134
ESP_EARLY_LOGV(TAG, "%s '%s' '%s'", __FUNCTION__, path, mode);
135-
void *f = esp_apptrace_fopen(ESP_APPTRACE_DEST_JTAG, path, mode);
135+
void *f = esp_apptrace_fopen(path, mode);
136136
ESP_EARLY_LOGV(TAG, "%s ret %p", __FUNCTION__, f);
137137
return f;
138138
}
139139

140140
int gcov_rtio_fclose(void *stream)
141141
{
142142
ESP_EARLY_LOGV(TAG, "%s", __FUNCTION__);
143-
return esp_apptrace_fclose(ESP_APPTRACE_DEST_JTAG, stream);
143+
return esp_apptrace_fclose(stream);
144144
}
145145

146146
size_t gcov_rtio_fread(void *ptr, size_t size, size_t nmemb, void *stream)
147147
{
148148
ESP_EARLY_LOGV(TAG, "%s read %u", __FUNCTION__, size * nmemb);
149-
size_t sz = esp_apptrace_fread(ESP_APPTRACE_DEST_JTAG, ptr, size, nmemb, stream);
149+
size_t sz = esp_apptrace_fread(ptr, size, nmemb, stream);
150150
ESP_EARLY_LOGV(TAG, "%s actually read %u", __FUNCTION__, sz);
151151
return sz;
152152
}
153153

154154
size_t gcov_rtio_fwrite(const void *ptr, size_t size, size_t nmemb, void *stream)
155155
{
156156
ESP_EARLY_LOGV(TAG, "%s", __FUNCTION__);
157-
return esp_apptrace_fwrite(ESP_APPTRACE_DEST_JTAG, ptr, size, nmemb, stream);
157+
return esp_apptrace_fwrite(ptr, size, nmemb, stream);
158158
}
159159

160160
int gcov_rtio_fseek(void *stream, long offset, int whence)
161161
{
162-
int ret = esp_apptrace_fseek(ESP_APPTRACE_DEST_JTAG, stream, offset, whence);
162+
int ret = esp_apptrace_fseek(stream, offset, whence);
163163
ESP_EARLY_LOGV(TAG, "%s(%p %ld %d) = %d", __FUNCTION__, stream, offset, whence, ret);
164164
return ret;
165165
}
166166

167167
long gcov_rtio_ftell(void *stream)
168168
{
169-
long ret = esp_apptrace_ftell(ESP_APPTRACE_DEST_JTAG, stream);
169+
long ret = esp_apptrace_ftell(stream);
170170
ESP_EARLY_LOGV(TAG, "%s(%p) = %ld", __FUNCTION__, stream, ret);
171171
return ret;
172172
}
173173

174174
int gcov_rtio_feof(void *stream)
175175
{
176-
int ret = esp_apptrace_feof(ESP_APPTRACE_DEST_JTAG, stream);
176+
int ret = esp_apptrace_feof(stream);
177177
ESP_EARLY_LOGV(TAG, "%s(%p) = %d", __FUNCTION__, stream, ret);
178178
return ret;
179179
}

‎esp_gcov/idf_component.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
version: 1.0.2
1+
version: 1.0.3
22
description: Gcov (Source Code Coverage) component for ESP-IDF
33
url: https://github.com/espressif/idf-extra-components/tree/master/esp_gcov
44
issues: https://github.com/espressif/idf-extra-components/issues
55
repository: https://github.com/espressif/idf-extra-components.git
66
dependencies:
7-
idf: ">=6.0"
7+
idf: ">=6.1"

‎esp_gcov/sdkconfig.rename‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# sdkconfig replacement configurations for deprecated options formatted as
2+
# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
3+
4+
CONFIG_ESP32_GCOV_ENABLE CONFIG_ESP_GCOV_ENABLE
5+
CONFIG_APPTRACE_GCOV_DUMP_TASK_STACK_SIZE CONFIG_ESP_GCOV_DUMP_TASK_STACK_SIZE

0 commit comments

Comments
 (0)