Merge pull request #161 from card-io-ecg/wifi_update

Wifi update
card-io-ecg · Feb 25, 2024 · 00650a0 · 00650a0
2 parents eaf8e17 + 02ef36c
commit 00650a0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,6 @@ embedded-nal-async = "0.7.0"
 embedded-io = "0.6"
 embedded-io-async = "0.6"
 embedded-menu = "0.6.0"
-embedded-svc = { version = "0.27", default-features = false }
 embassy-net = { version = "0.4", features = [
     "tcp",
     "dhcpv4",
@@ -128,7 +127,6 @@ embedded-nal-async.workspace = true
 embedded-io.workspace = true
 embedded-io-async.workspace = true
 embedded-menu.workspace = true
-embedded-svc.workspace = true
 embassy-net.workspace = true
 embassy-sync.workspace = true
 
@@ -162,6 +160,7 @@ esp32c6-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212
 esp32h2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
 esp-hal-procmacros = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
 esp-hal-common = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
+esp-wifi = { git = "https://github.com/esp-rs/esp-wifi", rev = "d200a167237f03cf63edce721a5f85fd65d2db84" }
 
 [features]
 default = ["defmt"]
@@ -228,7 +227,6 @@ defmt = [
     "dep:defmt",
     "norfs/defmt",
     "embedded-io/defmt-03",
-    "embedded-svc/defmt",
     "embedded-graphics/defmt",
     "esp-println/defmt-espflash",
     "esp-wifi/defmt",

diff --git a/bad-server/Cargo.toml b/bad-server/Cargo.toml
@@ -10,7 +10,6 @@ async-io = { version = "1", optional = true }
 defmt = { workspace = true, optional = true }
 embassy-net = { workspace = true, optional = true }
 embedded-io-async = { workspace = true }
-embedded-svc = { workspace = true }
 heapless = { workspace = true, features = ["ufmt"] }
 httparse = { version = "1.8", default-features = false }
 logger = { workspace = true }

diff --git a/src/board/wifi/ap.rs b/src/board/wifi/ap.rs
@@ -13,9 +13,11 @@ use crate::{
 use embassy_executor::Spawner;
 use embassy_futures::join::join;
 use embassy_net::{Config, Stack};
-use embedded_svc::wifi::{AccessPointConfiguration, Configuration, Wifi as _};
 use esp_wifi::{
-    wifi::{WifiApDevice, WifiController, WifiDevice, WifiEvent},
+    wifi::{
+        AccessPointConfiguration, Configuration, WifiApDevice, WifiController, WifiDevice,
+        WifiEvent,
+    },
     EspWifiInitialization,
 };
 use macros as cardio;

diff --git a/src/board/wifi/ap_sta.rs b/src/board/wifi/ap_sta.rs
@@ -22,7 +22,6 @@ use embassy_futures::{
     select::{select, Either},
 };
 use embassy_net::Config;
-use embedded_svc::wifi::Wifi as _;
 use esp_wifi::{wifi::WifiController, EspWifiInitialization};
 use macros as cardio;
 

diff --git a/src/board/wifi/sta.rs b/src/board/wifi/sta.rs
@@ -24,10 +24,12 @@ use embassy_sync::{
     signal::Signal,
 };
 use embassy_time::{with_timeout, Duration};
-use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wifi as _};
 use enumset::EnumSet;
 use esp_wifi::{
-    wifi::{WifiController, WifiDevice, WifiEvent, WifiStaDevice},
+    wifi::{
+        AccessPointInfo, ClientConfiguration, Configuration, WifiController, WifiDevice, WifiEvent,
+        WifiStaDevice,
+    },
     EspWifiInitialization,
 };
 use gui::widgets::wifi_client::WifiClientState;