Skip to content

Commit 5c75a99

Browse files
committed
Merge branch 'fix/esp-event-profiling_v5.4' into 'release/v5.4'
fix(esp_event): Fix event loop profiling in handler_execute function (backport v5.4) See merge request espressif/esp-idf!36684
2 parents 8deb26b + 8e8d922 commit 5c75a99

File tree

6 files changed

+381
-90
lines changed

6 files changed

+381
-90
lines changed

components/esp_eth/test_apps/main/esp_eth_test_apps.c

+3
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,10 @@ TEST_CASE("ethernet io loopback", "[ethernet]")
434434
TEST_ESP_OK(esp_eth_driver_uninstall(eth_handle));
435435
TEST_ESP_OK(phy->del(phy));
436436
TEST_ESP_OK(mac->del(mac));
437+
#ifndef CONFIG_TARGET_ETH_PHY_DEVICE_W5500
438+
// only unregister events if the device != W5500, since w5500 doesn't support loopback and we don't register the event
437439
TEST_ESP_OK(esp_event_handler_unregister(ETH_EVENT, ESP_EVENT_ANY_ID, eth_event_handler));
440+
#endif
438441
TEST_ESP_OK(esp_event_loop_delete_default());
439442
extra_cleanup();
440443
vEventGroupDelete(eth_event_group);

0 commit comments

Comments
 (0)