File tree Expand file tree Collapse file tree 3 files changed +8
-8
lines changed
samples/subsys/shell/shell_module Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 1
- CONFIG_USB_DEVICE_STACK=y
2
- CONFIG_USB_DEVICE_PRODUCT="Zephyr USB shell sample"
1
+ CONFIG_USB_DEVICE_STACK_NEXT=y
2
+ CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y
3
+ CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Zephyr USB shell sample"
3
4
CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y
4
- CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF =y
5
+ CONFIG_USBD_CDC_ACM_LOG_LEVEL_OFF =y
5
6
CONFIG_UART_LINE_CTRL=y
6
- CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
7
+ CONFIG_LOG_DEFAULT_LEVEL=1
7
8
8
9
# POSIX_TIMERS requires an embedded C library while the native USB driver is incompatible with it.
9
10
# So let's disable it. Once USB_NATIVE_POSIX supports embedded C libraries this can be removed.
Original file line number Diff line number Diff line change 13
13
extra_configs :
14
14
- arch:posix:CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
15
15
sample.shell.shell_module.usb :
16
- depends_on : usb_device
16
+ depends_on : usbd
17
17
tags :
18
18
- shell
19
19
- usb
23
23
- EXTRA_CONF_FILE="overlay-usb.conf"
24
24
- DTC_OVERLAY_FILE="usb.overlay"
25
25
integration_platforms :
26
- - native_sim
26
+ - frdm_k64f
27
27
sample.shell.shell_module.minimal :
28
28
filter : CONFIG_SERIAL and dt_chosen_enabled("zephyr,shell-uart")
29
29
tags : shell
Original file line number Diff line number Diff line change 10
10
#include <zephyr/logging/log.h>
11
11
#include <stdlib.h>
12
12
#include <zephyr/drivers/uart.h>
13
- #include <zephyr/usb/usb_device.h>
14
13
#include <ctype.h>
15
14
16
15
#ifdef CONFIG_ARCH_POSIX
@@ -378,7 +377,7 @@ int main(void)
378
377
uint32_t dtr = 0 ;
379
378
380
379
dev = DEVICE_DT_GET (DT_CHOSEN (zephyr_shell_uart ));
381
- if (!device_is_ready (dev ) || usb_enable ( NULL ) ) {
380
+ if (!device_is_ready (dev )) {
382
381
return 0 ;
383
382
}
384
383
You can’t perform that action at this time.
0 commit comments