kingkevin
/
espressif_idf-extra-components
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #105 from espressif/fix/usb/tests 

Fix/usb/tests
This commit is contained in:
Tomas Rezucha 2022-11-08 09:00:54 +01:00 committed by GitHub
parent 86deb9a9da aac444fb05
commit 17d5e366ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usb/test_app/main/idf_component.yml Normal file
View File

@ -0,0 +1,6 @@
## IDF Component Manager Manifest File
dependencies:
espressif/esp_tinyusb:
version: "0.0.1"
rules:
- if: "idf_version >= 5.0"

2
usb/usb_host_cdc_acm/idf_component.yml
View File

@ -1,4 +1,4 @@
version: "1.0.3"
version: "1.0.4"
description: USB Host CDC-ACM driver
url: https://github.com/espressif/idf-extra-components/tree/master/usb/usb_host_cdc_acm
dependencies:

1
usb/usb_host_cdc_acm/include/usb/cdc_acm_host.h
View File

@ -333,7 +333,6 @@ public:
}
private:
CdcAcmDevice(const CdcAcmDevice &Copy);
CdcAcmDevice &operator= (const CdcAcmDevice &Copy);
bool operator== (const CdcAcmDevice &param) const;
bool operator!= (const CdcAcmDevice &param) const;

9
usb/usb_host_cdc_acm/test/CMakeLists.txt
View File

@ -1,3 +1,10 @@
include($ENV{IDF_PATH}/tools/cmake/version.cmake)
set (TINYUSB_LIB)
if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.0")
set(TINYUSB_LIB "esp_tinyusb")
else()
set(TINYUSB_LIB "tinyusb")
endif()
idf_component_register(SRCS "test_cdc_acm_host.c" "usb_device.c"
INCLUDE_DIRS "."
REQUIRES usb_host_cdc_acm tinyusb unity)
REQUIRES usb_host_cdc_acm unity ${TINYUSB_LIB})

1
usb/usb_host_cdc_acm/test/test_cdc_acm_host.c
View File

@ -48,7 +48,6 @@ void usb_lib_task(void *arg)
.target = USB_PHY_TARGET_INT,
.otg_mode = USB_OTG_MODE_HOST,
.otg_speed = USB_PHY_SPEED_UNDEFINED, //In Host mode, the speed is determined by the connected device
.gpio_conf = NULL,
};
TEST_ASSERT_EQUAL(ESP_OK, usb_new_phy(&phy_config, &phy_hdl));
// Install USB Host driver. Should only be called once in entire application

2
usb/usb_host_msc/idf_component.yml
View File

@ -1,4 +1,4 @@
version: "1.0.2"
version: "1.0.3"
description: USB Host MSC driver
url: https://github.com/espressif/idf-extra-components/tree/master/usb/usb_host_msc

9
usb/usb_host_msc/test/CMakeLists.txt
View File

@ -1,3 +1,10 @@
include($ENV{IDF_PATH}/tools/cmake/version.cmake)
set (TINYUSB_LIB)
if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.0")
set(TINYUSB_LIB "esp_tinyusb")
else()
set(TINYUSB_LIB "tinyusb")
endif()
idf_component_register(SRC_DIRS .
INCLUDE_DIRS .
REQUIRES unity usb usb_host_msc tinyusb)
REQUIRES unity usb usb_host_msc ${TINYUSB_LIB})

5
usb/usb_host_msc/test/test_msc.c
View File

@ -188,7 +188,6 @@ static void msc_setup(void)
.target = USB_PHY_TARGET_INT,
.otg_mode = USB_OTG_MODE_HOST,
.otg_speed = USB_PHY_SPEED_UNDEFINED, //In Host mode, the speed is determined by the connected device
.gpio_conf = NULL,
};
ESP_OK_ASSERT(usb_new_phy(&phy_config, &phy_hdl));
const usb_host_config_t host_config = {
@ -220,8 +219,7 @@ static void msc_setup(void)
static void msc_teardown(void)
{
// Wait to finish any ongoing USB operations
vTaskDelay(100);
vTaskDelay(10); // Wait to finish any ongoing USB operations
ESP_OK_ASSERT( msc_host_vfs_unregister(vfs_handle) );
ESP_OK_ASSERT( msc_host_uninstall_device(device) );
@ -235,6 +233,7 @@ static void msc_teardown(void)
phy_hdl = NULL;
vQueueDelete(app_queue);
vTaskDelay(10); // Wait for FreeRTOS to clean up deleted tasks
}
static void write_read_sectors(void)