diff options
| author | Jacob Rosenthal <[email protected]> | 2021-12-14 15:47:54 -0700 |
|---|---|---|
| committer | Jacob Rosenthal <[email protected]> | 2021-12-14 15:47:54 -0700 |
| commit | 07cbd41131a89ec0982f0ac6a3237d0544375f97 (patch) | |
| tree | 95aa5efac0283baef94a24ccb43862d5f968153c /examples/nrf/src/bin | |
| parent | f31140a70bbc7c14b07acf6305eb8a0a73560e5a (diff) | |
dont expose embedded_hal_common::usb
Diffstat (limited to 'examples/nrf/src/bin')
| -rw-r--r-- | examples/nrf/src/bin/usb_uart.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/examples/nrf/src/bin/usb_uart.rs b/examples/nrf/src/bin/usb_uart.rs index 902075dfc..9313fdb1e 100644 --- a/examples/nrf/src/bin/usb_uart.rs +++ b/examples/nrf/src/bin/usb_uart.rs | |||
| @@ -16,8 +16,7 @@ use panic_probe as _; // print out panic messages | |||
| 16 | use embassy::executor::Spawner; | 16 | 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_nrf::usb::{ReadInterface, State, Usb, UsbSerial, UsbThing, WriteInterface}; |
| 20 | use embassy_nrf::usb::{Usb as UsbDevice, UsbBus}; | ||
| 21 | use embassy_nrf::{interrupt, Peripherals}; | 20 | use embassy_nrf::{interrupt, Peripherals}; |
| 22 | use usb_device::device::{UsbDeviceBuilder, UsbVidPid}; | 21 | use usb_device::device::{UsbDeviceBuilder, UsbVidPid}; |
| 23 | 22 | ||
| @@ -26,12 +25,9 @@ async fn main(_spawner: Spawner, p: Peripherals) { | |||
| 26 | let mut tx_buffer = [0u8; 1024]; | 25 | let mut tx_buffer = [0u8; 1024]; |
| 27 | let mut rx_buffer = [0u8; 640]; | 26 | let mut rx_buffer = [0u8; 640]; |
| 28 | 27 | ||
| 29 | let _usb_dev = UsbDevice::new(p.USBD); | 28 | let usb_bus = UsbThing::new(); |
| 30 | |||
| 31 | let usb_bus = UsbBus::new(); | ||
| 32 | 29 | ||
| 33 | let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer); | 30 | let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer); |
| 34 | |||
| 35 | let device = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x16c0, 0x27dd)) | 31 | let device = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x16c0, 0x27dd)) |
| 36 | .manufacturer("Fake company") | 32 | .manufacturer("Fake company") |
| 37 | .product("Serial port") | 33 | .product("Serial port") |
