diff --git a/samples/zephyr/subsys/usb/cdc_acm/CMakeLists.txt b/samples/zephyr/subsys/usb/cdc_acm/CMakeLists.txt index 5e23dd6f7d75..5893a38fd9af 100644 --- a/samples/zephyr/subsys/usb/cdc_acm/CMakeLists.txt +++ b/samples/zephyr/subsys/usb/cdc_acm/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(mass) +project(cdc_acm) include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake) FILE(GLOB app_sources ${ZEPHYR_BASE}/samples/subsys/usb/cdc_acm/src/*.c) diff --git a/samples/zephyr/subsys/usb/cdc_acm/app.overlay b/samples/zephyr/subsys/usb/cdc_acm/app.overlay index 800d63caf033..832bfb4af7e8 100644 --- a/samples/zephyr/subsys/usb/cdc_acm/app.overlay +++ b/samples/zephyr/subsys/usb/cdc_acm/app.overlay @@ -1,5 +1,6 @@ &zephyr_udc0 { cdc_acm_uart0 { compatible = "zephyr,cdc-acm-uart"; + label = "Zephyr USB CDC-ACM"; }; }; diff --git a/samples/zephyr/subsys/usb/cdc_acm/prj.conf b/samples/zephyr/subsys/usb/cdc_acm/prj.conf index 55e4fe9217fb..e0012027ec6a 100644 --- a/samples/zephyr/subsys/usb/cdc_acm/prj.conf +++ b/samples/zephyr/subsys/usb/cdc_acm/prj.conf @@ -1,11 +1,14 @@ +CONFIG_USB_DEVICE_STACK_NEXT=y + CONFIG_STDOUT_CONSOLE=y -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_PRODUCT="Zephyr CDC ACM sample" -CONFIG_USB_DEVICE_PID=0x0001 -CONFIG_LOG=y -CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y CONFIG_SERIAL=y -CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_LINE_CTRL=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n +CONFIG_USBD_CDC_ACM_CLASS=y + +CONFIG_LOG=y +CONFIG_USBD_LOG_LEVEL_ERR=y +CONFIG_UDC_DRIVER_LOG_LEVEL_ERR=y +CONFIG_USBD_CDC_ACM_LOG_LEVEL_ERR=y + +CONFIG_SAMPLE_USBD_PID=0x0001 +CONFIG_SAMPLE_USBD_PRODUCT="USBD CDC ACM sample" diff --git a/samples/zephyr/subsys/usb/cdc_acm/sample.yaml b/samples/zephyr/subsys/usb/cdc_acm/sample.yaml index 896fdff8f3af..ad8b38c63499 100644 --- a/samples/zephyr/subsys/usb/cdc_acm/sample.yaml +++ b/samples/zephyr/subsys/usb/cdc_acm/sample.yaml @@ -1,24 +1,25 @@ sample: name: CDC ACM USB +common: + tags: + - usb + - ci_samples_zephyr_subsys_usb + platform_allow: + - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp + integration_platforms: + - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp + harness: console + harness_config: + type: multi_line + regex: + - "Wait for DTR" + - "cdc_acm_echo: USBD message: New device configuration" + - "cdc_acm_echo: USBD message: CDC ACM line coding" + - "cdc_acm_echo: Baudrate" tests: - nrf.extended.sample.usb_device_next.cdc-acm: - tags: - - usb - - ci_samples_zephyr_subsys_usb - extra_args: CONF_FILE="usbd_next_prj.conf" - platform_allow: - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0.csp/nrf54lm20a/cpuapp - - nrf54h20dk/nrf54h20/cpuapp - integration_platforms: - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54h20dk/nrf54h20/cpuapp - harness: console - harness_config: - type: one_line - regex: - - "Wait for DTR" - - "cdc_acm_echo: USBD message: CDC ACM control line state" - - "cdc_acm_echo: USBD message: CDC ACM line coding" - - "cdc_acm_echo: Baudrate 115200" + nrf.extended.sample.usb_device_next.cdc-acm: {} + nrf.extended.sample.usb_device_next.cdc-acm-workqueue: + extra_args: + - DCONFIG_USBD_CDC_ACM_WORKQUEUE=y diff --git a/samples/zephyr/subsys/usb/cdc_acm/usbd_next_prj.conf b/samples/zephyr/subsys/usb/cdc_acm/usbd_next_prj.conf deleted file mode 100644 index f08928438b77..000000000000 --- a/samples/zephyr/subsys/usb/cdc_acm/usbd_next_prj.conf +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG_USB_DEVICE_STACK_NEXT=y - -CONFIG_STDOUT_CONSOLE=y -CONFIG_SERIAL=y -CONFIG_UART_LINE_CTRL=y -CONFIG_USBD_CDC_ACM_CLASS=y - -CONFIG_LOG=y -CONFIG_USBD_LOG_LEVEL_WRN=y -CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y -CONFIG_USBD_CDC_ACM_LOG_LEVEL_ERR=y - -CONFIG_SAMPLE_USBD_PID=0x0001 -CONFIG_SAMPLE_USBD_PRODUCT="USBD CDC ACM sample" diff --git a/samples/zephyr/subsys/usb/hid-keyboard/prj.conf b/samples/zephyr/subsys/usb/hid-keyboard/prj.conf index 9813712669e8..4f277d40e62f 100644 --- a/samples/zephyr/subsys/usb/hid-keyboard/prj.conf +++ b/samples/zephyr/subsys/usb/hid-keyboard/prj.conf @@ -5,9 +5,8 @@ CONFIG_LOG=y CONFIG_USBD_LOG_LEVEL_INF=y CONFIG_USBD_HID_LOG_LEVEL_WRN=y CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y -CONFIG_LOG_BUFFER_SIZE=8192 - CONFIG_SAMPLE_USBD_PID=0x0007 +CONFIG_SAMPLE_USBD_REMOTE_WAKEUP=y CONFIG_GPIO=y CONFIG_INPUT=y diff --git a/samples/zephyr/subsys/usb/hid-keyboard/sample.yaml b/samples/zephyr/subsys/usb/hid-keyboard/sample.yaml index 71e0b9e9d0b2..a318b0a2396f 100644 --- a/samples/zephyr/subsys/usb/hid-keyboard/sample.yaml +++ b/samples/zephyr/subsys/usb/hid-keyboard/sample.yaml @@ -3,7 +3,6 @@ sample: common: filter: dt_alias_exists("sw0") and dt_alias_exists("led0") depends_on: - # - usbd - gpio tags: - usb @@ -20,42 +19,20 @@ common: - "USBD message: VBUS ready" - "Actual device speed 2" - "s-in-status finished" + integration_platforms: + - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp + platform_allow: + - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp tests: - nrf.extended.sample.usbd.hid-keyboard: - integration_platforms: - - nrf54h20dk/nrf54h20/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuapp - platform_allow: - - nrf54h20dk/nrf54h20/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp + nrf.extended.sample.usbd.hid-keyboard: {} nrf.extended.sample.usbd.hid-keyboard.out-report: - integration_platforms: - - nrf54h20dk/nrf54h20/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuapp - platform_allow: - - nrf54h20dk/nrf54h20/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp extra_args: - EXTRA_DTC_OVERLAY_FILE="out_report.overlay" nrf.extended.sample.usbd.hid-keyboard.large-report: - integration_platforms: - - nrf54h20dk/nrf54h20/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuapp - platform_allow: - - nrf54h20dk/nrf54h20/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp extra_args: - EXTRA_DTC_OVERLAY_FILE="large_in_report.overlay" nrf.extended.sample.usbd.hid-keyboard.large-out-report: - integration_platforms: - - nrf54h20dk/nrf54h20/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuapp - platform_allow: - - nrf54h20dk/nrf54h20/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp extra_args: - EXTRA_DTC_OVERLAY_FILE="large_out_report.overlay" diff --git a/samples/zephyr/subsys/usb/hid-mouse/prj.conf b/samples/zephyr/subsys/usb/hid-mouse/prj.conf index 30fa2d9ee80c..9d5ea1fc142e 100644 --- a/samples/zephyr/subsys/usb/hid-mouse/prj.conf +++ b/samples/zephyr/subsys/usb/hid-mouse/prj.conf @@ -5,7 +5,6 @@ CONFIG_LOG=y CONFIG_USBD_LOG_LEVEL_INF=y CONFIG_USBD_HID_LOG_LEVEL_WRN=y CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y -CONFIG_LOG_BUFFER_SIZE=8192 CONFIG_SAMPLE_USBD_PID=0x0007 CONFIG_GPIO=y diff --git a/samples/zephyr/subsys/usb/hid-mouse/sample.yaml b/samples/zephyr/subsys/usb/hid-mouse/sample.yaml index 8c5d3446e5a8..de1d5a1b26b3 100644 --- a/samples/zephyr/subsys/usb/hid-mouse/sample.yaml +++ b/samples/zephyr/subsys/usb/hid-mouse/sample.yaml @@ -10,15 +10,6 @@ common: tests: nrf.extended.sample.usb_device_next.hid-mouse: - # depends_on: - # - usbd - integration_platforms: - - nrf54h20dk/nrf54h20/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuapp - platform_allow: - - nrf54h20dk/nrf54h20/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp timeout: 15 harness: console harness_config: @@ -28,3 +19,9 @@ tests: - "FS bNumConfigurations 1" - "Actual device speed 2" - "s-in-status finished" + integration_platforms: + - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp + platform_allow: + - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp diff --git a/samples/zephyr/subsys/usb/mass/prj.conf b/samples/zephyr/subsys/usb/mass/prj.conf index 0954afcd0eec..dd9d784070de 100644 --- a/samples/zephyr/subsys/usb/mass/prj.conf +++ b/samples/zephyr/subsys/usb/mass/prj.conf @@ -1,14 +1,15 @@ +CONFIG_USB_DEVICE_STACK_NEXT=y + CONFIG_STDOUT_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_UART_LINE_CTRL=y +CONFIG_USBD_MSC_CLASS=y +CONFIG_USBD_MSC_LUNS_PER_INSTANCE=3 -#USB related configs -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_PRODUCT="Zephyr MSC sample" -CONFIG_USB_DEVICE_PID=0x0008 CONFIG_LOG=y -CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y -CONFIG_USB_MASS_STORAGE=y -CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y -CONFIG_USB_MASS_STORAGE_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n +CONFIG_USBD_LOG_LEVEL_WRN=y +CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y -CONFIG_MAIN_STACK_SIZE=1536 +CONFIG_SAMPLE_USBD_PID=0x0008 +CONFIG_SAMPLE_USBD_PRODUCT="USBD MSC sample" +CONFIG_MAIN_STACK_SIZE=2048 diff --git a/samples/zephyr/subsys/usb/mass/sample.yaml b/samples/zephyr/subsys/usb/mass/sample.yaml index 22aa3a20a765..b588ec3858f4 100644 --- a/samples/zephyr/subsys/usb/mass/sample.yaml +++ b/samples/zephyr/subsys/usb/mass/sample.yaml @@ -1,24 +1,22 @@ sample: name: Mass Storage +common: + min_ram: 128 + platform_allow: + - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp + integration_platforms: + - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp + extra_args: + - EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay" + tags: + - msd + - usb + - ci_samples_zephyr_subsys_usb + tests: - nrf.extended.sample.usb_device_next.mass_ram_none: - platform_allow: - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0.csp/nrf54lm20a/cpuapp - - nrf54h20dk/nrf54h20/cpuapp - integration_platforms: - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54h20dk/nrf54h20/cpuapp - extra_args: - - CONF_FILE="usbd_next_prj.conf" - - EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay" - extra_configs: - - CONFIG_LOG_DEFAULT_LEVEL=3 - tags: - - msd - - usb - - ci_samples_zephyr_subsys_usb + nrf.extended.sample.usbd.mass_ram_none: harness: console harness_config: type: multi_line @@ -28,24 +26,9 @@ tests: - "The device is put in USB mass storage mode." - "usbd_msc: Enable" - "usbd_msc: Bulk-Only Mass Storage Reset" - nrf.extended.sample.usb_device_next.mass_flash_fatfs: - modules: - - fatfs - filter: dt_compat_enabled("nordic,qspi-nor") - platform_allow: - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0.csp/nrf54lm20a/cpuapp - integration_platforms: - - nrf54lm20pdk/nrf54lm20a/cpuapp - extra_args: CONF_FILE="usbd_next_prj.conf" extra_configs: - CONFIG_LOG_DEFAULT_LEVEL=3 - - CONFIG_APP_MSC_STORAGE_FLASH_FATFS=y - tags: - - msd - - usb - - ci_samples_zephyr_subsys_usb + nrf.extended.sample.usbd.mass_ram_fat: harness: console harness_config: type: multi_line @@ -55,3 +38,6 @@ tests: - "The device is put in USB mass storage mode." - "usbd_msc: Enable" - "usbd_msc: Bulk-Only Mass Storage Reset" + extra_configs: + - CONFIG_LOG_DEFAULT_LEVEL=3 + - CONFIG_APP_MSC_STORAGE_RAM=y diff --git a/samples/zephyr/subsys/usb/mass/usbd_next_prj.conf b/samples/zephyr/subsys/usb/mass/usbd_next_prj.conf deleted file mode 100644 index dd9d784070de..000000000000 --- a/samples/zephyr/subsys/usb/mass/usbd_next_prj.conf +++ /dev/null @@ -1,15 +0,0 @@ -CONFIG_USB_DEVICE_STACK_NEXT=y - -CONFIG_STDOUT_CONSOLE=y -CONFIG_SERIAL=y -CONFIG_UART_LINE_CTRL=y -CONFIG_USBD_MSC_CLASS=y -CONFIG_USBD_MSC_LUNS_PER_INSTANCE=3 - -CONFIG_LOG=y -CONFIG_USBD_LOG_LEVEL_WRN=y -CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y - -CONFIG_SAMPLE_USBD_PID=0x0008 -CONFIG_SAMPLE_USBD_PRODUCT="USBD MSC sample" -CONFIG_MAIN_STACK_SIZE=2048 diff --git a/tests/subsys/usb/negotiated_speed/testcase.yaml b/tests/subsys/usb/negotiated_speed/testcase.yaml index 187e34a3670f..d2cd9a9c8543 100644 --- a/tests/subsys/usb/negotiated_speed/testcase.yaml +++ b/tests/subsys/usb/negotiated_speed/testcase.yaml @@ -12,8 +12,7 @@ tests: - nrf54h20dk/nrf54h20/cpuapp platform_allow: - nrf54h20dk/nrf54h20/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp extra_configs: - CONFIG_LOG_DEFAULT_LEVEL=3 - CONFIG_APP_MSC_STORAGE_RAM=y diff --git a/west.yml b/west.yml index da88c90f57a4..899b3decc5e0 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 5ca258a1523d6f9a9211c51770fa7e7be2fa27ad + revision: c1bf4336ce6d3a1bf6007c06c9ed8142183e16d1 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above