make send, consolidate usb types

This commit is contained in:
Jacob Rosenthal
2021-12-13 18:13:38 -07:00
parent 83a1237ea3
commit 535d30335a
2 changed files with 8 additions and 19 deletions

View File

@ -17,7 +17,7 @@ use embassy::executor::Spawner;
use embassy::io::{AsyncBufReadExt, AsyncWriteExt};
use embassy::time::{Duration, Timer};
use embassy_hal_common::usb::{State, Usb, UsbSerial};
use embassy_nrf::usb::{Usb as UsbDevice, UsbBus};
use embassy_nrf::usb::Usb as UsbDevice;
use embassy_nrf::{interrupt, Peripherals};
use usb_device::device::{UsbDeviceBuilder, UsbVidPid};
@ -26,9 +26,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
let mut tx_buffer = [0u8; 1024];
let mut rx_buffer = [0u8; 640];
let _usb_dev = UsbDevice::new(p.USBD);
let usb_bus = UsbBus::new();
let usb_bus = UsbDevice::new(p.USBD);
let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer);