.

esp-rs · Oct 30, 2023 · 5542df9 · 5542df9
1 parent f442429
commit 5542df9
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 31 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -54,7 +54,7 @@ libm = "0.2.7"
 cfg-if = "1.0.0"
 
 embassy-net = { version = "0.2.0", features = ["nightly", "tcp", "udp", "dhcpv4", "medium-ethernet"] }
-bleps = { git = "https://github.com/bjoernQ/bleps", package = "bleps", rev = "b82f1e7009bef7e32f0918be5b186188aa5e7109", features = ["macros"] }
+bleps = { git = "https://github.com/bjoernQ/bleps", package = "bleps", rev = "60b3881", features = ["macros"] }
 embassy-executor = { version = "0.3.0", package = "embassy-executor", features = ["nightly", "executor-thread", "integrated-timers"] }
 embassy-time = { version = "0.1.3", features = ["nightly"] }
 futures-util = { version = "0.3.28", default-features = false }

diff --git a/esp-wifi/Cargo.toml b/esp-wifi/Cargo.toml
@@ -19,6 +19,7 @@ embedded-svc = { workspace = true, optional = true }
 enumset = { workspace = true, optional = true }
 linked_list_allocator = { workspace = true }
 embedded-io.workspace = true
+embedded-io-async = { workspace = true, optional = true }
 fugit.workspace = true
 heapless = { workspace = true, default-features = false }
 num-derive = { workspace = true, features = ["full-syntax"] }
@@ -48,7 +49,7 @@ esp32s3 = [ "esp32s3-hal", "esp-wifi-sys/esp32s3" ]
 async = [
   "dep:embassy-sync",
   "dep:embassy-futures",
-  "embedded-io/async",
+  "embedded-io-async",
   "esp32c3-hal?/embassy",
   "esp32c2-hal?/embassy",
   "esp32c6-hal?/embassy",

diff --git a/esp-wifi/src/ble/controller/mod.rs b/esp-wifi/src/ble/controller/mod.rs
@@ -1,7 +1,4 @@
-use embedded_io::{
-    blocking::{Read, Write},
-    Error, Io,
-};
+use embedded_io::{Error, ErrorType, Read, Write};
 
 use crate::hal::{
     peripheral::{Peripheral, PeripheralRef},
@@ -45,7 +42,7 @@ impl Error for BleConnectorError {
     }
 }
 
-impl Io for BleConnector<'_> {
+impl ErrorType for BleConnector<'_> {
     type Error = BleConnectorError;
 }
 

diff --git a/esp-wifi/src/wifi_interface.rs b/esp-wifi/src/wifi_interface.rs
@@ -1,7 +1,7 @@
 use core::cell::RefCell;
 use core::fmt::Display;
-use embedded_io::blocking::{Read, Write};
-use embedded_io::Io;
+use embedded_io::ErrorType;
+use embedded_io::{Read, Write};
 
 use embedded_svc::ipv4;
 use smoltcp::iface::{Interface, SocketHandle, SocketSet};
@@ -612,7 +612,7 @@ impl embedded_io::Error for IoError {
     }
 }
 
-impl<'s, 'n: 's> Io for Socket<'s, 'n> {
+impl<'s, 'n: 's> ErrorType for Socket<'s, 'n> {
     type Error = IoError;
 }
 

diff --git a/examples-esp32/examples/access_point.rs b/examples-esp32/examples/access_point.rs
@@ -7,7 +7,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32/examples/coex.rs b/examples-esp32/examples/coex.rs
@@ -18,7 +18,7 @@ use esp_wifi::{
     EspWifiInitFor,
 };
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32/examples/dhcp.rs b/examples-esp32/examples/dhcp.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32/examples/static_ip.rs b/examples-esp32/examples/static_ip.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32c2/examples/access_point.rs b/examples-esp32c2/examples/access_point.rs
@@ -7,7 +7,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32c2/examples/dhcp.rs b/examples-esp32c2/examples/dhcp.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32c2/examples/static_ip.rs b/examples-esp32c2/examples/static_ip.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32c3/examples/access_point.rs b/examples-esp32c3/examples/access_point.rs
@@ -7,7 +7,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32c3/examples/coex.rs b/examples-esp32c3/examples/coex.rs
@@ -18,7 +18,7 @@ use esp_wifi::{
     EspWifiInitFor,
 };
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32c3/examples/dhcp.rs b/examples-esp32c3/examples/dhcp.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32c3/examples/static_ip.rs b/examples-esp32c3/examples/static_ip.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32c6/examples/access_point.rs b/examples-esp32c6/examples/access_point.rs
@@ -7,7 +7,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32c6/examples/dhcp.rs b/examples-esp32c6/examples/dhcp.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32c6/examples/static_ip.rs b/examples-esp32c6/examples/static_ip.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32s2/examples/access_point.rs b/examples-esp32s2/examples/access_point.rs
@@ -7,7 +7,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32s2/examples/dhcp.rs b/examples-esp32s2/examples/dhcp.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32s2/examples/static_ip.rs b/examples-esp32s2/examples/static_ip.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32s3/examples/access_point.rs b/examples-esp32s3/examples/access_point.rs
@@ -7,7 +7,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32s3/examples/coex.rs b/examples-esp32s3/examples/coex.rs
@@ -18,7 +18,7 @@ use esp_wifi::{
     EspWifiInitFor,
 };
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32s3/examples/dhcp.rs b/examples-esp32s3/examples/dhcp.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};
 

diff --git a/examples-esp32s3/examples/static_ip.rs b/examples-esp32s3/examples/static_ip.rs
@@ -5,7 +5,7 @@
 mod examples_util;
 use examples_util::hal;
 
-use embedded_io::blocking::*;
+use embedded_io::*;
 use embedded_svc::ipv4::Interface;
 use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi};