Fix move of takepipe to common

mkj · Dec 9, 2023 · 0f5c66b · 0f5c66b
1 parent f3c011f
commit 0f5c66b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/async/Cargo.toml b/async/Cargo.toml
@@ -44,7 +44,7 @@ pretty-hex = "0.3"
 whoami = "1.3"
 zeroize = "1.5"
 
-tokio = { version = "1.17", features = ["full"] }
+tokio = { version = "1.25", features = ["full"] }
 
 # adapters for tokio and async-std
 embedded-io-adapters = { version = "0.6", features = ["tokio-1"] }

diff --git a/embassy/demos/common/Cargo.toml b/embassy/demos/common/Cargo.toml
@@ -28,6 +28,11 @@ defmt = { version = "0.3", optional = true }
 log = "0.4"
 pretty-hex = { version = "0.3", default-features = false }
 
+[dev-dependencies]
+anyhow = { version = "1.0" }
+sunset = { path = "../../..", features = ["std"] }
+tokio = { version = "1.25", features = ["full"] }
+
 [features]
 defmt = ["dep:defmt", "embedded-io-async/defmt-03"]
 log = ["embassy-net/log"]
diff --git a/embassy/demos/common/src/lib.rs b/embassy/demos/common/src/lib.rs
@@ -9,6 +9,7 @@ mod server;
 pub mod config;
 pub mod menu;
 pub mod demo_menu;
+pub mod takepipe;
 
 pub use server::{DemoServer, listener};
 pub use config::SSHConfig;

diff --git a/embassy/demos/picow/src/main.rs b/embassy/demos/picow/src/main.rs
@@ -36,7 +36,6 @@ pub(crate) use sunset_demo_embassy_common as demo_common;
 mod flashconfig;
 mod picowmenu;
 mod serial;
-mod takepipe;
 mod usb;
 mod keyboard;
 #[cfg(feature = "w5500")]
@@ -50,7 +49,7 @@ compile_error!("No network device selected. Use cyw43 or w5500 feature");
 #[cfg(all(feature = "cyw43", feature = "w5500"))]
 compile_error!("Select only one of cyw43 or w5500");
 
-use demo_common::{SSHConfig, DemoServer};
+use demo_common::{SSHConfig, DemoServer, takepipe};
 
 use takepipe::TakePipe;