diff options
| author | Jacob Rosenthal <[email protected]> | 2021-12-14 13:51:50 -0700 |
|---|---|---|
| committer | Jacob Rosenthal <[email protected]> | 2021-12-14 13:51:50 -0700 |
| commit | f31140a70bbc7c14b07acf6305eb8a0a73560e5a (patch) | |
| tree | 93b4a873ebcaf88eadc35fd33e39c3b4f1817845 /examples/nrf/src | |
| parent | 535d30335a7c4ae47e923c5e85851df80d2021a0 (diff) | |
revert
Diffstat (limited to 'examples/nrf/src')
| -rw-r--r-- | examples/nrf/src/bin/usb_uart.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/examples/nrf/src/bin/usb_uart.rs b/examples/nrf/src/bin/usb_uart.rs index 86ead84b5..902075dfc 100644 --- a/examples/nrf/src/bin/usb_uart.rs +++ b/examples/nrf/src/bin/usb_uart.rs | |||
| @@ -17,7 +17,7 @@ use embassy::executor::Spawner; | |||
| 17 | use embassy::io::{AsyncBufReadExt, AsyncWriteExt}; | 17 | use embassy::io::{AsyncBufReadExt, AsyncWriteExt}; |
| 18 | use embassy::time::{Duration, Timer}; | 18 | use embassy::time::{Duration, Timer}; |
| 19 | use embassy_hal_common::usb::{State, Usb, UsbSerial}; | 19 | use embassy_hal_common::usb::{State, Usb, UsbSerial}; |
| 20 | use embassy_nrf::usb::Usb as UsbDevice; | 20 | use embassy_nrf::usb::{Usb as UsbDevice, UsbBus}; |
| 21 | use embassy_nrf::{interrupt, Peripherals}; | 21 | use embassy_nrf::{interrupt, Peripherals}; |
| 22 | use usb_device::device::{UsbDeviceBuilder, UsbVidPid}; | 22 | use usb_device::device::{UsbDeviceBuilder, UsbVidPid}; |
| 23 | 23 | ||
| @@ -26,7 +26,9 @@ async fn main(_spawner: Spawner, p: Peripherals) { | |||
| 26 | let mut tx_buffer = [0u8; 1024]; | 26 | let mut tx_buffer = [0u8; 1024]; |
| 27 | let mut rx_buffer = [0u8; 640]; | 27 | let mut rx_buffer = [0u8; 640]; |
| 28 | 28 | ||
| 29 | let usb_bus = UsbDevice::new(p.USBD); | 29 | let _usb_dev = UsbDevice::new(p.USBD); |
| 30 | |||
| 31 | let usb_bus = UsbBus::new(); | ||
| 30 | 32 | ||
| 31 | let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer); | 33 | let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer); |
| 32 | 34 | ||
