diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2023-05-14 22:57:38 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-05-14 22:57:38 +0000 |
| commit | 2bf2e54db925e1d8845deb5eaea737b6add95402 (patch) | |
| tree | 2256480f69f8e2aa36a568b1aa85a68bbe0da42d /examples/std/src | |
| parent | 6e93d193cfdd2982410e106c383ecc1f066fccfb (diff) | |
| parent | 288309b9d51830aada3d09311ff6da95faab78e1 (diff) | |
Merge #1456
1456: net: do not use smoltcp Instant/Duration in public API, docs. r=Dirbaio a=Dirbaio
bors r+
Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'examples/std/src')
| -rw-r--r-- | examples/std/src/bin/net.rs | 3 | ||||
| -rw-r--r-- | examples/std/src/bin/net_udp.rs | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/examples/std/src/bin/net.rs b/examples/std/src/bin/net.rs index e018e18c9..d93616254 100644 --- a/examples/std/src/bin/net.rs +++ b/examples/std/src/bin/net.rs | |||
| @@ -6,6 +6,7 @@ use clap::Parser; | |||
| 6 | use embassy_executor::{Executor, Spawner}; | 6 | use embassy_executor::{Executor, Spawner}; |
| 7 | use embassy_net::tcp::TcpSocket; | 7 | use embassy_net::tcp::TcpSocket; |
| 8 | use embassy_net::{Config, Ipv4Address, Ipv4Cidr, Stack, StackResources}; | 8 | use embassy_net::{Config, Ipv4Address, Ipv4Cidr, Stack, StackResources}; |
| 9 | use embassy_time::Duration; | ||
| 9 | use embedded_io::asynch::Write; | 10 | use embedded_io::asynch::Write; |
| 10 | use heapless::Vec; | 11 | use heapless::Vec; |
| 11 | use log::*; | 12 | use log::*; |
| @@ -75,7 +76,7 @@ async fn main_task(spawner: Spawner) { | |||
| 75 | let mut tx_buffer = [0; 4096]; | 76 | let mut tx_buffer = [0; 4096]; |
| 76 | let mut socket = TcpSocket::new(stack, &mut rx_buffer, &mut tx_buffer); | 77 | let mut socket = TcpSocket::new(stack, &mut rx_buffer, &mut tx_buffer); |
| 77 | 78 | ||
| 78 | socket.set_timeout(Some(embassy_net::SmolDuration::from_secs(10))); | 79 | socket.set_timeout(Some(Duration::from_secs(10))); |
| 79 | 80 | ||
| 80 | let remote_endpoint = (Ipv4Address::new(192, 168, 69, 100), 8000); | 81 | let remote_endpoint = (Ipv4Address::new(192, 168, 69, 100), 8000); |
| 81 | info!("connecting to {:?}...", remote_endpoint); | 82 | info!("connecting to {:?}...", remote_endpoint); |
diff --git a/examples/std/src/bin/net_udp.rs b/examples/std/src/bin/net_udp.rs index 328a0536c..4df23edf6 100644 --- a/examples/std/src/bin/net_udp.rs +++ b/examples/std/src/bin/net_udp.rs | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | use clap::Parser; | 3 | use clap::Parser; |
| 4 | use embassy_executor::{Executor, Spawner}; | 4 | use embassy_executor::{Executor, Spawner}; |
| 5 | use embassy_net::udp::UdpSocket; | 5 | use embassy_net::udp::{PacketMetadata, UdpSocket}; |
| 6 | use embassy_net::{Config, Ipv4Address, Ipv4Cidr, PacketMetadata, Stack, StackResources}; | 6 | use embassy_net::{Config, Ipv4Address, Ipv4Cidr, Stack, StackResources}; |
| 7 | use heapless::Vec; | 7 | use heapless::Vec; |
| 8 | use log::*; | 8 | use log::*; |
| 9 | use rand_core::{OsRng, RngCore}; | 9 | use rand_core::{OsRng, RngCore}; |
