diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-05-06 23:54:07 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-05-06 23:54:07 +0000 |
| commit | a4bf190f2f0ce28a298626de6de1c8059269cedc (patch) | |
| tree | fa773719cb35c57657f5bb147810bffde82f757f /examples/stm32f7 | |
| parent | 7e774ff8300cb4df6c561f99f1c33485256155e6 (diff) | |
| parent | 931a137f8c5a760c2e06c437c98d14eff3e3a587 (diff) | |
Merge #752
752: Replace embassy::io with embedded_io. r=Dirbaio a=Dirbaio
TODO:
- [x] Release embedded-io on crates.io
- [x] Remove git dep
Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'examples/stm32f7')
| -rw-r--r-- | examples/stm32f7/Cargo.toml | 1 | ||||
| -rw-r--r-- | examples/stm32f7/src/bin/eth.rs | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/stm32f7/Cargo.toml b/examples/stm32f7/Cargo.toml index ce0a6d48f..f7af77da4 100644 --- a/examples/stm32f7/Cargo.toml +++ b/examples/stm32f7/Cargo.toml | |||
| @@ -9,6 +9,7 @@ resolver = "2" | |||
| 9 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime"] } | 9 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime"] } |
| 10 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "net", "stm32f767zi", "unstable-pac", "time-driver-any", "exti"] } | 10 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "net", "stm32f767zi", "unstable-pac", "time-driver-any", "exti"] } |
| 11 | embassy-net = { path = "../../embassy-net", features = ["defmt", "tcp", "medium-ethernet", "pool-16"] } | 11 | embassy-net = { path = "../../embassy-net", features = ["defmt", "tcp", "medium-ethernet", "pool-16"] } |
| 12 | embedded-io = { version = "0.2.0", features = ["async"] } | ||
| 12 | 13 | ||
| 13 | defmt = "0.3" | 14 | defmt = "0.3" |
| 14 | defmt-rtt = "0.3" | 15 | defmt-rtt = "0.3" |
diff --git a/examples/stm32f7/src/bin/eth.rs b/examples/stm32f7/src/bin/eth.rs index 33e41de9c..dca9338b2 100644 --- a/examples/stm32f7/src/bin/eth.rs +++ b/examples/stm32f7/src/bin/eth.rs | |||
| @@ -5,12 +5,10 @@ | |||
| 5 | use cortex_m_rt::entry; | 5 | use cortex_m_rt::entry; |
| 6 | use defmt::*; | 6 | use defmt::*; |
| 7 | use embassy::executor::{Executor, Spawner}; | 7 | use embassy::executor::{Executor, Spawner}; |
| 8 | use embassy::io::AsyncWriteExt; | ||
| 9 | use embassy::time::{Duration, Timer}; | 8 | use embassy::time::{Duration, Timer}; |
| 10 | use embassy::util::Forever; | 9 | use embassy::util::Forever; |
| 11 | use embassy_net::{ | 10 | use embassy_net::tcp::TcpSocket; |
| 12 | Config as NetConfig, Ipv4Address, Ipv4Cidr, StackResources, StaticConfigurator, TcpSocket, | 11 | use embassy_net::{Config as NetConfig, Ipv4Address, Ipv4Cidr, StackResources, StaticConfigurator}; |
| 13 | }; | ||
| 14 | use embassy_stm32::eth::generic_smi::GenericSMI; | 12 | use embassy_stm32::eth::generic_smi::GenericSMI; |
| 15 | use embassy_stm32::eth::{Ethernet, State}; | 13 | use embassy_stm32::eth::{Ethernet, State}; |
| 16 | use embassy_stm32::interrupt; | 14 | use embassy_stm32::interrupt; |
| @@ -19,6 +17,7 @@ use embassy_stm32::peripherals::RNG; | |||
| 19 | use embassy_stm32::rng::Rng; | 17 | use embassy_stm32::rng::Rng; |
| 20 | use embassy_stm32::time::U32Ext; | 18 | use embassy_stm32::time::U32Ext; |
| 21 | use embassy_stm32::Config; | 19 | use embassy_stm32::Config; |
| 20 | use embedded_io::asynch::Write; | ||
| 22 | use heapless::Vec; | 21 | use heapless::Vec; |
| 23 | 22 | ||
| 24 | use defmt_rtt as _; // global logger | 23 | use defmt_rtt as _; // global logger |
