aboutsummaryrefslogtreecommitdiff
path: root/examples/rp
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-09-22 15:46:07 +0000
committerGitHub <[email protected]>2022-09-22 15:46:07 +0000
commitdacbc9acd5969d3ef0dda8825c960e909008ce83 (patch)
tree87d150bf3398969d4e8cec4f014e8d5ea043ec3a /examples/rp
parentc1e25067daa53983777807f6d173f1318767b88a (diff)
parent10d1ad2343825388277dc54db649c9349a0b6de8 (diff)
Merge #963
963: Remove some uses of the `futures` crate r=Dirbaio a=Dirbaio - use `Future` from `core` - `poll_fn` is now stable in `core` since Rust 1.64 (out today) - Use `join` from `embassy-futures`. Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'examples/rp')
-rw-r--r--examples/rp/Cargo.toml1
-rw-r--r--examples/rp/src/bin/usb_serial.rs2
2 files changed, 2 insertions, 1 deletions
diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml
index 17393322c..24c3cdd67 100644
--- a/examples/rp/Cargo.toml
+++ b/examples/rp/Cargo.toml
@@ -13,6 +13,7 @@ embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defm
13embassy-usb-serial = { version = "0.1.0", path = "../../embassy-usb-serial", features = ["defmt"] } 13embassy-usb-serial = { version = "0.1.0", path = "../../embassy-usb-serial", features = ["defmt"] }
14embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "pool-16"] } 14embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "pool-16"] }
15embassy-usb-ncm = { version = "0.1.0", path = "../../embassy-usb-ncm", features = ["defmt"] } 15embassy-usb-ncm = { version = "0.1.0", path = "../../embassy-usb-ncm", features = ["defmt"] }
16embassy-futures = { version = "0.1.0", path = "../../embassy-futures" }
16 17
17defmt = "0.3" 18defmt = "0.3"
18defmt-rtt = "0.3" 19defmt-rtt = "0.3"
diff --git a/examples/rp/src/bin/usb_serial.rs b/examples/rp/src/bin/usb_serial.rs
index 00cf3e93f..bf92a1636 100644
--- a/examples/rp/src/bin/usb_serial.rs
+++ b/examples/rp/src/bin/usb_serial.rs
@@ -4,12 +4,12 @@
4 4
5use defmt::{info, panic}; 5use defmt::{info, panic};
6use embassy_executor::Spawner; 6use embassy_executor::Spawner;
7use embassy_futures::join::join;
7use embassy_rp::interrupt; 8use embassy_rp::interrupt;
8use embassy_rp::usb::{Driver, Instance}; 9use embassy_rp::usb::{Driver, Instance};
9use embassy_usb::driver::EndpointError; 10use embassy_usb::driver::EndpointError;
10use embassy_usb::{Builder, Config}; 11use embassy_usb::{Builder, Config};
11use embassy_usb_serial::{CdcAcmClass, State}; 12use embassy_usb_serial::{CdcAcmClass, State};
12use futures::future::join;
13use {defmt_rtt as _, panic_probe as _}; 13use {defmt_rtt as _, panic_probe as _};
14 14
15#[embassy_executor::main] 15#[embassy_executor::main]