Skip to content

Commit a92896b

Browse files
committed
tests: bluetooth: shell: use generic CDC ACM shield
Remove CDC ACM UART devicetree and config overlay, and explicit USB support initialization in favor of generic CDC ACM shield. For shell support via USB CDC ACM, this example is to be built as follows: west build -b nrf52840dongle_nrf52840 tests/bluetooth/shell -- -DSHIELD=cdc_acm_shell Signed-off-by: Johann Fischer <[email protected]>
1 parent 1d52620 commit a92896b

File tree

4 files changed

+1
-41
lines changed

4 files changed

+1
-41
lines changed

tests/bluetooth/shell/cdc_acm.conf

Lines changed: 0 additions & 6 deletions
This file was deleted.

tests/bluetooth/shell/src/main.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,21 +123,6 @@ static void hrs_notify(void)
123123

124124
void main(void)
125125
{
126-
#if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_shell_uart), zephyr_cdc_acm_uart)
127-
const struct device *dev;
128-
uint32_t dtr = 0;
129-
130-
dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart));
131-
if (!device_is_ready(dev) || usb_enable(NULL)) {
132-
return;
133-
}
134-
135-
while (!dtr) {
136-
uart_line_ctrl_get(dev, UART_LINE_CTRL_DTR, &dtr);
137-
k_sleep(K_MSEC(100));
138-
}
139-
#endif
140-
141126
printk("Type \"help\" for supported commands.");
142127
printk("Before any Bluetooth commands you must `bt init` to initialize"
143128
" the stack.\n");

tests/bluetooth/shell/testcase.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ tests:
88
harness: keyboard
99
min_flash: 145
1010
bluetooth.shell.cdc_acm:
11-
extra_args: OVERLAY_CONFIG=cdc_acm.conf
12-
DTC_OVERLAY_FILE="usb.overlay"
11+
extra_args: SHIELD="cdc_acm_shell"
1312
depends_on: usb_device
1413
platform_allow: native_posix native_posix_64 nrf52840dk_nrf52840
1514
platform_exclude: nrf52dk_nrf52810

tests/bluetooth/shell/usb.overlay

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)