diff options
| author | Jacob Rosenthal <[email protected]> | 2021-12-13 18:13:38 -0700 |
|---|---|---|
| committer | Jacob Rosenthal <[email protected]> | 2021-12-13 18:13:42 -0700 |
| commit | 535d30335a7c4ae47e923c5e85851df80d2021a0 (patch) | |
| tree | 87523cad2e1a09242cee781b2af27869f30a2850 /examples/nrf/src | |
| parent | 83a1237ea3f8b164749cb895b7bdb7a5696107f6 (diff) | |
make send, consolidate usb types
Diffstat (limited to 'examples/nrf/src')
| -rw-r--r-- | examples/nrf/src/bin/usb_uart.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/examples/nrf/src/bin/usb_uart.rs b/examples/nrf/src/bin/usb_uart.rs index 902075dfc..86ead84b5 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, UsbBus}; | 20 | use embassy_nrf::usb::Usb as UsbDevice; |
| 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,9 +26,7 @@ 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_dev = UsbDevice::new(p.USBD); | 29 | let usb_bus = UsbDevice::new(p.USBD); |
| 30 | |||
| 31 | let usb_bus = UsbBus::new(); | ||
| 32 | 30 | ||
| 33 | let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer); | 31 | let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer); |
| 34 | 32 | ||
