aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/nrf/Cargo.toml1
-rw-r--r--examples/nrf/src/bin/usb_uart.rs6
2 files changed, 3 insertions, 4 deletions
diff --git a/examples/nrf/Cargo.toml b/examples/nrf/Cargo.toml
index 646ba496f..a144cb715 100644
--- a/examples/nrf/Cargo.toml
+++ b/examples/nrf/Cargo.toml
@@ -9,7 +9,6 @@ version = "0.1.0"
9embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] } 9embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] }
10embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] } 10embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
11embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote"] } 11embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote"] }
12embassy-hal-common = { version = "0.1.0", path = "../../embassy-hal-common" }
13 12
14defmt = "0.3" 13defmt = "0.3"
15defmt-rtt = "0.3" 14defmt-rtt = "0.3"
diff --git a/examples/nrf/src/bin/usb_uart.rs b/examples/nrf/src/bin/usb_uart.rs
index 9313fdb1e..84bce65e5 100644
--- a/examples/nrf/src/bin/usb_uart.rs
+++ b/examples/nrf/src/bin/usb_uart.rs
@@ -16,18 +16,19 @@ use panic_probe as _; // print out panic messages
16use embassy::executor::Spawner; 16use embassy::executor::Spawner;
17use embassy::io::{AsyncBufReadExt, AsyncWriteExt}; 17use embassy::io::{AsyncBufReadExt, AsyncWriteExt};
18use embassy::time::{Duration, Timer}; 18use embassy::time::{Duration, Timer};
19use embassy_nrf::usb::{ReadInterface, State, Usb, UsbSerial, UsbThing, WriteInterface}; 19use embassy_nrf::usb::{State, Usb, UsbSerial, UsbThing};
20use embassy_nrf::{interrupt, Peripherals}; 20use embassy_nrf::{interrupt, Peripherals};
21use usb_device::device::{UsbDeviceBuilder, UsbVidPid}; 21use usb_device::device::{UsbDeviceBuilder, UsbVidPid};
22 22
23#[embassy::main] 23#[embassy::main]
24async fn main(_spawner: Spawner, p: Peripherals) { 24async fn main(_spawner: Spawner, _p: Peripherals) {
25 let mut tx_buffer = [0u8; 1024]; 25 let mut tx_buffer = [0u8; 1024];
26 let mut rx_buffer = [0u8; 640]; 26 let mut rx_buffer = [0u8; 640];
27 27
28 let usb_bus = UsbThing::new(); 28 let usb_bus = UsbThing::new();
29 29
30 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);
31
31 let device = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x16c0, 0x27dd)) 32 let device = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x16c0, 0x27dd))
32 .manufacturer("Fake company") 33 .manufacturer("Fake company")
33 .product("Serial port") 34 .product("Serial port")
@@ -42,7 +43,6 @@ async fn main(_spawner: Spawner, p: Peripherals) {
42 43
43 let usb = unsafe { Usb::new(&mut state, device, serial, irq) }; 44 let usb = unsafe { Usb::new(&mut state, device, serial, irq) };
44 pin_mut!(usb); 45 pin_mut!(usb);
45 // usb.start();
46 46
47 let (mut read_interface, mut write_interface) = usb.as_ref().take_serial_0(); 47 let (mut read_interface, mut write_interface) = usb.as_ref().take_serial_0();
48 48