-
Notifications
You must be signed in to change notification settings - Fork 20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(esp_tinyusb): Uninstall TinyUSB driver while external task is using #115
Draft
roma-jam
wants to merge
2
commits into
feature/esp32p4_fs_phy_config
Choose a base branch
from
feature/tusb_task_test_apps
base: feature/esp32p4_fs_phy_config
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+698
−11
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# The following lines of boilerplate have to be in your project's | ||
# CMakeLists in this exact order for cmake to work correctly | ||
cmake_minimum_required(VERSION 3.16) | ||
include($ENV{IDF_PATH}/tools/cmake/project.cmake) | ||
|
||
# "Trim" the build. Include the minimal set of components, main, and anything it depends on. | ||
set(COMPONENTS main) | ||
|
||
project(test_app_default_task_without_init) |
4 changes: 4 additions & 0 deletions
4
device/esp_tinyusb/test_apps/default_task/main/CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
idf_component_register(SRC_DIRS . | ||
INCLUDE_DIRS . | ||
REQUIRES unity | ||
WHOLE_ARCHIVE) |
5 changes: 5 additions & 0 deletions
5
device/esp_tinyusb/test_apps/default_task/main/idf_component.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
## IDF Component Manager Manifest File | ||
dependencies: | ||
espressif/esp_tinyusb: | ||
version: "*" | ||
override_path: "../../../" |
62 changes: 62 additions & 0 deletions
62
device/esp_tinyusb/test_apps/default_task/main/test_app_main.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
#include <stdio.h> | ||
#include <string.h> | ||
#include "unity.h" | ||
#include "unity_test_runner.h" | ||
#include "unity_test_utils_memory.h" | ||
|
||
void app_main(void) | ||
{ | ||
/* | ||
_ _ _ | ||
| | (_) | | | ||
___ ___ _ __ | |_ _ _ __ _ _ _ _ ___| |__ | ||
/ _ \/ __| '_ \| __| | '_ \| | | | | | / __| '_ \ | ||
| __/\__ \ |_) | |_| | | | | |_| | |_| \__ \ |_) | | ||
\___||___/ .__/ \__|_|_| |_|\__, |\__,_|___/_.__/ | ||
| |______ __/ | | ||
|_|______| |___/ | ||
_____ _____ _____ _____ | ||
|_ _| ___/ ___|_ _| | ||
| | | |__ \ `--. | | | ||
| | | __| `--. \ | | | ||
| | | |___/\__/ / | | | ||
\_/ \____/\____/ \_/ | ||
*/ | ||
|
||
printf(" _ _ _ \n"); | ||
printf(" | | (_) | | \n"); | ||
printf(" ___ ___ _ __ | |_ _ _ __ _ _ _ _ ___| |__ \n"); | ||
printf(" / _ \\/ __| '_ \\| __| | '_ \\| | | | | | / __| '_ \\ \n"); | ||
printf("| __/\\__ \\ |_) | |_| | | | | |_| | |_| \\__ \\ |_) |\n"); | ||
printf(" \\___||___/ .__/ \\__|_|_| |_|\\__, |\\__,_|___/_.__/ \n"); | ||
printf(" | |______ __/ | \n"); | ||
printf(" |_|______| |___/ \n"); | ||
printf(" _____ _____ _____ _____ \n"); | ||
printf("|_ _| ___/ ___|_ _| \n"); | ||
printf(" | | | |__ \\ `--. | | \n"); | ||
printf(" | | | __| `--. \\ | | \n"); | ||
printf(" | | | |___/\\__/ / | | \n"); | ||
printf(" \\_/ \\____/\\____/ \\_/ \n"); | ||
|
||
unity_utils_setup_heap_record(80); | ||
unity_utils_set_leak_level(128); | ||
unity_run_menu(); | ||
} | ||
|
||
/* setUp runs before every test */ | ||
void setUp(void) | ||
{ | ||
unity_utils_record_free_mem(); | ||
} | ||
|
||
/* tearDown runs after every test */ | ||
void tearDown(void) | ||
{ | ||
unity_utils_evaluate_leaks(); | ||
} |
112 changes: 112 additions & 0 deletions
112
device/esp_tinyusb/test_apps/default_task/main/test_tusb.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,112 @@ | ||||||||||||||||
/* | ||||||||||||||||
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD | ||||||||||||||||
* | ||||||||||||||||
* SPDX-License-Identifier: Apache-2.0 | ||||||||||||||||
*/ | ||||||||||||||||
|
||||||||||||||||
#include "soc/soc_caps.h" | ||||||||||||||||
#if SOC_USB_OTG_SUPPORTED | ||||||||||||||||
|
||||||||||||||||
// | ||||||||||||||||
#include <stdio.h> | ||||||||||||||||
#include <string.h> | ||||||||||||||||
// | ||||||||||||||||
#include "freertos/FreeRTOS.h" | ||||||||||||||||
#include "freertos/task.h" | ||||||||||||||||
#include "freertos/semphr.h" | ||||||||||||||||
// | ||||||||||||||||
#include "esp_system.h" | ||||||||||||||||
#include "esp_log.h" | ||||||||||||||||
#include "esp_err.h" | ||||||||||||||||
// | ||||||||||||||||
#include "unity.h" | ||||||||||||||||
#include "tinyusb.h" | ||||||||||||||||
|
||||||||||||||||
static const char *TAG = "default_task"; | ||||||||||||||||
|
||||||||||||||||
SemaphoreHandle_t wait_mount = NULL; | ||||||||||||||||
|
||||||||||||||||
#define TEARDOWN_DEVICE_DELAY_MS 1000 | ||||||||||||||||
|
||||||||||||||||
#define TUSB_DESC_TOTAL_LEN (TUD_CONFIG_DESC_LEN) | ||||||||||||||||
static uint8_t const test_configuration_descriptor[] = { | ||||||||||||||||
// Config number, interface count, string index, total length, attribute, power in mA | ||||||||||||||||
TUD_CONFIG_DESCRIPTOR(1, 0, 0, TUSB_DESC_TOTAL_LEN, TUSB_DESC_CONFIG_ATT_SELF_POWERED | TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, 100), | ||||||||||||||||
}; | ||||||||||||||||
|
||||||||||||||||
static const tusb_desc_device_t test_device_descriptor = { | ||||||||||||||||
.bLength = sizeof(test_device_descriptor), | ||||||||||||||||
.bDescriptorType = TUSB_DESC_DEVICE, | ||||||||||||||||
.bcdUSB = 0x0200, | ||||||||||||||||
.bDeviceClass = TUSB_CLASS_MISC, | ||||||||||||||||
.bDeviceSubClass = MISC_SUBCLASS_COMMON, | ||||||||||||||||
.bDeviceProtocol = MISC_PROTOCOL_IAD, | ||||||||||||||||
.bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE, | ||||||||||||||||
.idVendor = 0x303A, // This is Espressif VID. This needs to be changed according to Users / Customers | ||||||||||||||||
.idProduct = 0x4002, | ||||||||||||||||
.bcdDevice = 0x100, | ||||||||||||||||
.iManufacturer = 0x01, | ||||||||||||||||
.iProduct = 0x02, | ||||||||||||||||
.iSerialNumber = 0x03, | ||||||||||||||||
.bNumConfigurations = 0x01 | ||||||||||||||||
}; | ||||||||||||||||
|
||||||||||||||||
#if (TUD_OPT_HIGH_SPEED) | ||||||||||||||||
static const tusb_desc_device_qualifier_t device_qualifier = { | ||||||||||||||||
.bLength = sizeof(tusb_desc_device_qualifier_t), | ||||||||||||||||
.bDescriptorType = TUSB_DESC_DEVICE_QUALIFIER, | ||||||||||||||||
.bcdUSB = 0x0200, | ||||||||||||||||
.bDeviceClass = TUSB_CLASS_MISC, | ||||||||||||||||
.bDeviceSubClass = MISC_SUBCLASS_COMMON, | ||||||||||||||||
.bDeviceProtocol = MISC_PROTOCOL_IAD, | ||||||||||||||||
.bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE, | ||||||||||||||||
.bNumConfigurations = 0x01, | ||||||||||||||||
.bReserved = 0 | ||||||||||||||||
}; | ||||||||||||||||
#endif // TUD_OPT_HIGH_SPEED | ||||||||||||||||
|
||||||||||||||||
// Invoked when device is mounted | ||||||||||||||||
void tud_mount_cb(void) | ||||||||||||||||
{ | ||||||||||||||||
xSemaphoreGive(wait_mount); | ||||||||||||||||
} | ||||||||||||||||
|
||||||||||||||||
/** | ||||||||||||||||
* @brief TinyUSB Teardown specific testcase | ||||||||||||||||
* | ||||||||||||||||
* Scenario: | ||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||
*/ | ||||||||||||||||
TEST_CASE("tinyusb_default_task_with_init", "[esp_tinyusb][tusb_task]") | ||||||||||||||||
{ | ||||||||||||||||
wait_mount = xSemaphoreCreateBinary(); | ||||||||||||||||
TEST_ASSERT_NOT_EQUAL(NULL, wait_mount); | ||||||||||||||||
|
||||||||||||||||
// TinyUSB driver configuration | ||||||||||||||||
const tinyusb_config_t tusb_cfg = { | ||||||||||||||||
.device_descriptor = &test_device_descriptor, | ||||||||||||||||
.string_descriptor = NULL, | ||||||||||||||||
.string_descriptor_count = 0, | ||||||||||||||||
.external_phy = false, | ||||||||||||||||
#if (TUD_OPT_HIGH_SPEED) | ||||||||||||||||
.fs_configuration_descriptor = test_configuration_descriptor, | ||||||||||||||||
.hs_configuration_descriptor = test_configuration_descriptor, | ||||||||||||||||
.qualifier_descriptor = &device_qualifier, | ||||||||||||||||
#else | ||||||||||||||||
.configuration_descriptor = test_configuration_descriptor, | ||||||||||||||||
#endif // TUD_OPT_HIGH_SPEED | ||||||||||||||||
}; | ||||||||||||||||
|
||||||||||||||||
TEST_ASSERT_EQUAL(ESP_OK, tinyusb_driver_install(&tusb_cfg)); | ||||||||||||||||
// Wait for the usb event | ||||||||||||||||
ESP_LOGD(TAG, "wait mount..."); | ||||||||||||||||
TEST_ASSERT_EQUAL(pdTRUE, xSemaphoreTake(wait_mount, pdMS_TO_TICKS(TEARDOWN_DEVICE_DELAY_MS))); | ||||||||||||||||
ESP_LOGD(TAG, "mounted"); | ||||||||||||||||
|
||||||||||||||||
// Teardown | ||||||||||||||||
vTaskDelay(pdMS_TO_TICKS(TEARDOWN_DEVICE_DELAY_MS)); | ||||||||||||||||
TEST_ASSERT_EQUAL(ESP_OK, tinyusb_driver_uninstall()); | ||||||||||||||||
// Remove primitives | ||||||||||||||||
vSemaphoreDelete(wait_mount); | ||||||||||||||||
} | ||||||||||||||||
|
||||||||||||||||
#endif |
12 changes: 12 additions & 0 deletions
12
device/esp_tinyusb/test_apps/default_task/pytest_default_task.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD | ||
# SPDX-License-Identifier: Apache-2.0 | ||
|
||
import pytest | ||
from pytest_embedded_idf.dut import IdfDut | ||
|
||
@pytest.mark.esp32s2 | ||
@pytest.mark.esp32s3 | ||
@pytest.mark.esp32p4 | ||
@pytest.mark.usb_device | ||
def test_usb_default_task_with_init(dut: IdfDut) -> None: | ||
dut.run_all_single_board_cases(group='tusb_task') |
16 changes: 16 additions & 0 deletions
16
device/esp_tinyusb/test_apps/default_task/sdkconfig.defaults
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,16 @@ | ||||||
# Configure TinyUSB, it will be used to mock USB devices | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
CONFIG_TINYUSB_NO_DEFAULT_TASK=n | ||||||
CONFIG_TINYUSB_INIT_IN_DEFAULT_TASK=n | ||||||
|
||||||
# Disable watchdogs, they'd get triggered during unity interactive menu | ||||||
CONFIG_ESP_INT_WDT=n | ||||||
CONFIG_ESP_TASK_WDT=n | ||||||
|
||||||
# Run-time checks of Heap and Stack | ||||||
CONFIG_HEAP_POISONING_COMPREHENSIVE=y | ||||||
CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y | ||||||
CONFIG_COMPILER_STACK_CHECK=y | ||||||
|
||||||
CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL=y | ||||||
|
||||||
CONFIG_COMPILER_CXX_EXCEPTIONS=y |
9 changes: 9 additions & 0 deletions
9
device/esp_tinyusb/test_apps/default_task_with_init/CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# The following lines of boilerplate have to be in your project's | ||
# CMakeLists in this exact order for cmake to work correctly | ||
cmake_minimum_required(VERSION 3.16) | ||
include($ENV{IDF_PATH}/tools/cmake/project.cmake) | ||
|
||
# "Trim" the build. Include the minimal set of components, main, and anything it depends on. | ||
set(COMPONENTS main) | ||
|
||
project(test_app_default_task_with_init) |
4 changes: 4 additions & 0 deletions
4
device/esp_tinyusb/test_apps/default_task_with_init/main/CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
idf_component_register(SRC_DIRS . | ||
INCLUDE_DIRS . | ||
REQUIRES unity | ||
WHOLE_ARCHIVE) |
5 changes: 5 additions & 0 deletions
5
device/esp_tinyusb/test_apps/default_task_with_init/main/idf_component.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
## IDF Component Manager Manifest File | ||
dependencies: | ||
espressif/esp_tinyusb: | ||
version: "*" | ||
override_path: "../../../" |
62 changes: 62 additions & 0 deletions
62
device/esp_tinyusb/test_apps/default_task_with_init/main/test_app_main.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
#include <stdio.h> | ||
#include <string.h> | ||
#include "unity.h" | ||
#include "unity_test_runner.h" | ||
#include "unity_test_utils_memory.h" | ||
|
||
void app_main(void) | ||
{ | ||
/* | ||
_ _ _ | ||
| | (_) | | | ||
___ ___ _ __ | |_ _ _ __ _ _ _ _ ___| |__ | ||
/ _ \/ __| '_ \| __| | '_ \| | | | | | / __| '_ \ | ||
| __/\__ \ |_) | |_| | | | | |_| | |_| \__ \ |_) | | ||
\___||___/ .__/ \__|_|_| |_|\__, |\__,_|___/_.__/ | ||
| |______ __/ | | ||
|_|______| |___/ | ||
_____ _____ _____ _____ | ||
|_ _| ___/ ___|_ _| | ||
| | | |__ \ `--. | | | ||
| | | __| `--. \ | | | ||
| | | |___/\__/ / | | | ||
\_/ \____/\____/ \_/ | ||
*/ | ||
|
||
printf(" _ _ _ \n"); | ||
printf(" | | (_) | | \n"); | ||
printf(" ___ ___ _ __ | |_ _ _ __ _ _ _ _ ___| |__ \n"); | ||
printf(" / _ \\/ __| '_ \\| __| | '_ \\| | | | | | / __| '_ \\ \n"); | ||
printf("| __/\\__ \\ |_) | |_| | | | | |_| | |_| \\__ \\ |_) |\n"); | ||
printf(" \\___||___/ .__/ \\__|_|_| |_|\\__, |\\__,_|___/_.__/ \n"); | ||
printf(" | |______ __/ | \n"); | ||
printf(" |_|______| |___/ \n"); | ||
printf(" _____ _____ _____ _____ \n"); | ||
printf("|_ _| ___/ ___|_ _| \n"); | ||
printf(" | | | |__ \\ `--. | | \n"); | ||
printf(" | | | __| `--. \\ | | \n"); | ||
printf(" | | | |___/\\__/ / | | \n"); | ||
printf(" \\_/ \\____/\\____/ \\_/ \n"); | ||
|
||
unity_utils_setup_heap_record(80); | ||
unity_utils_set_leak_level(128); | ||
unity_run_menu(); | ||
} | ||
|
||
/* setUp runs before every test */ | ||
void setUp(void) | ||
{ | ||
unity_utils_record_free_mem(); | ||
} | ||
|
||
/* tearDown runs after every test */ | ||
void tearDown(void) | ||
{ | ||
unity_utils_evaluate_leaks(); | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.