Working CDC-ACM device->host

2 files changed, 15 insertions, 5 deletions

diff --git a/examples/nrf/Cargo.toml b/examples/nrf/Cargo.toml
index fb846b3a9..59e5de026 100644
--- a/examples/nrf/Cargo.toml
+++ b/examples/nrf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "embassy-nrf-examples"
 version = "0.1.0"
 
diff --git a/examples/nrf/src/bin/usb/main.rs b/examples/nrf/src/bin/usb/main.rs
index d175766bb..014ad5c6e 100644
--- a/examples/nrf/src/bin/usb/main.rs
+++ b/examples/nrf/src/bin/usb/main.rs
@@ -10,13 +10,14 @@ mod cdc_acm;
 use core::mem;
 use defmt::*;
 use embassy::executor::Spawner;
+use embassy::time::{Duration, Timer};
 use embassy_nrf::interrupt;
 use embassy_nrf::pac;
-use embassy_nrf::usb::{self, Driver};
+use embassy_nrf::usb::Driver;
 use embassy_nrf::Peripherals;
-use embassy_usb::driver::EndpointOut;
+use embassy_usb::driver::{EndpointIn, EndpointOut};
 use embassy_usb::{Config, UsbDeviceBuilder};
-use futures::future::{join, select};
+use futures::future::join3;
 
 use crate::cdc_acm::CdcAcmClass;
 
@@ -61,6 +62,15 @@ async fn main(_spawner: Spawner, p: Peripherals) {
             info!("data: {:x}", data);
         }
     };
+    let fut3 = async {
+        loop {
+            info!("writing...");
+            class.write_ep.write(b"Hello World!\r\n").await.unwrap();
+            info!("written");
+
+            Timer::after(Duration::from_secs(1)).await;
+        }
+    };
 
-    join(fut1, fut2).await;
+    join3(fut1, fut2, fut3).await;
 }