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/nrf/src | |
| 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/nrf/src')
| -rw-r--r-- | examples/nrf/src/bin/buffered_uart.rs | 2 | ||||
| -rw-r--r-- | examples/nrf/src/bin/usb_ethernet.rs | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/examples/nrf/src/bin/buffered_uart.rs b/examples/nrf/src/bin/buffered_uart.rs index 2cd163a9f..a64c5821b 100644 --- a/examples/nrf/src/bin/buffered_uart.rs +++ b/examples/nrf/src/bin/buffered_uart.rs | |||
| @@ -4,9 +4,9 @@ | |||
| 4 | 4 | ||
| 5 | use defmt::*; | 5 | use defmt::*; |
| 6 | use embassy::executor::Spawner; | 6 | use embassy::executor::Spawner; |
| 7 | use embassy::io::{AsyncBufReadExt, AsyncWriteExt}; | ||
| 8 | use embassy_nrf::buffered_uarte::State; | 7 | use embassy_nrf::buffered_uarte::State; |
| 9 | use embassy_nrf::{buffered_uarte::BufferedUarte, interrupt, uarte, Peripherals}; | 8 | use embassy_nrf::{buffered_uarte::BufferedUarte, interrupt, uarte, Peripherals}; |
| 9 | use embedded_io::asynch::{Read, Write}; | ||
| 10 | use futures::pin_mut; | 10 | use futures::pin_mut; |
| 11 | 11 | ||
| 12 | use defmt_rtt as _; // global logger | 12 | use defmt_rtt as _; // global logger |
diff --git a/examples/nrf/src/bin/usb_ethernet.rs b/examples/nrf/src/bin/usb_ethernet.rs index f14a29c49..843487c03 100644 --- a/examples/nrf/src/bin/usb_ethernet.rs +++ b/examples/nrf/src/bin/usb_ethernet.rs | |||
| @@ -10,9 +10,9 @@ use defmt::*; | |||
| 10 | use embassy::blocking_mutex::raw::ThreadModeRawMutex; | 10 | use embassy::blocking_mutex::raw::ThreadModeRawMutex; |
| 11 | use embassy::channel::Channel; | 11 | use embassy::channel::Channel; |
| 12 | use embassy::executor::Spawner; | 12 | use embassy::executor::Spawner; |
| 13 | use embassy::io::{AsyncBufReadExt, AsyncWriteExt}; | ||
| 14 | use embassy::util::Forever; | 13 | use embassy::util::Forever; |
| 15 | use embassy_net::{PacketBox, PacketBoxExt, PacketBuf, TcpSocket}; | 14 | use embassy_net::tcp::TcpSocket; |
| 15 | use embassy_net::{PacketBox, PacketBoxExt, PacketBuf}; | ||
| 16 | use embassy_nrf::pac; | 16 | use embassy_nrf::pac; |
| 17 | use embassy_nrf::usb::Driver; | 17 | use embassy_nrf::usb::Driver; |
| 18 | use embassy_nrf::Peripherals; | 18 | use embassy_nrf::Peripherals; |
| @@ -20,7 +20,9 @@ use embassy_nrf::{interrupt, peripherals}; | |||
| 20 | use embassy_usb::{Builder, Config, UsbDevice}; | 20 | use embassy_usb::{Builder, Config, UsbDevice}; |
| 21 | use embassy_usb_ncm::{CdcNcmClass, Receiver, Sender, State}; | 21 | use embassy_usb_ncm::{CdcNcmClass, Receiver, Sender, State}; |
| 22 | 22 | ||
| 23 | use defmt_rtt as _; // global logger | 23 | use defmt_rtt as _; |
| 24 | use embedded_io::asynch::{Read, Write}; | ||
| 25 | // global logger | ||
| 24 | use panic_probe as _; | 26 | use panic_probe as _; |
| 25 | 27 | ||
| 26 | type MyDriver = Driver<'static, peripherals::USBD>; | 28 | type MyDriver = Driver<'static, peripherals::USBD>; |
