Use released embassy-net

card-io-ecg · Oct 31, 2023 · 77426aa · 77426aa
1 parent 76c9dfc
commit 77426aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,14 +17,14 @@ embedded-io-new = { package = "embedded-io", version = "0.6" }
 embedded-io-async = { version = "0.6" }
 embedded-menu = "0.5.2"
 embedded-svc = { version = "0.25", default-features = false }
-embassy-net = { version = "0.2.0", features = [
+embassy-net = { version = "0.2.1", features = [
     "nightly",
     "tcp",
     "dhcpv4",
     "dns",
     "medium-ethernet",
 ] }
-embassy-sync = { version = "0.2.0" }
+embassy-sync = { version = "0.4.0" }
 embassy-executor = { version = "0.3.0", features = [
     "nightly",
 ] }
@@ -155,11 +155,7 @@ esp32s3-hal = { git = "https://github.com/bugadani/esp-hal.git", branch = "race"
 # esp-hal-common = { path = "../../esp-hal/esp-hal-common" }
 # esp-hal-procmacros = { path = "../../esp-hal/esp-hal-procmacros" }
 embedded-tls = { git = "https://github.com/drogue-iot/embedded-tls.git", branch = "old" }
-reqwless = { git = "https://github.com/drogue-iot/reqwless.git", branch = "main" }
 buffered-io = { git = "https://github.com/bugadani/buffered-io.git", branch = "old" }
-embassy-time = { git = "https://github.com/bugadani/embassy.git", branch = "old" }
-embassy-net = { git = "https://github.com/bugadani/embassy.git", branch = "old" }
-embassy-net-driver = { git = "https://github.com/bugadani/embassy.git", branch = "old" }
 
 [patch.'https://github.com/esp-rs/esp-wifi.git']
 # esp-wifi = { path = "../esp-wifi/esp-wifi" }

diff --git a/src/board/wifi/sta.rs b/src/board/wifi/sta.rs
@@ -646,7 +646,7 @@ impl StaController {
     }
 
     pub(super) async fn wait_for_command(&self) -> Command {
-        self.command_queue.recv().await
+        self.command_queue.receive().await
     }
 }
 

diff --git a/src/states/measure.rs b/src/states/measure.rs
@@ -183,7 +183,7 @@ async fn measure_impl(
 
     while !task_control.has_exited() && !context.battery_monitor.is_low() {
         let display_full = screen.buffer_full();
-        while let Ok(sample) = queue.try_recv() {
+        while let Ok(sample) = queue.try_receive() {
             samples += 1;
 
             if drop_samples == 0 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -646,7 +646,7 @@ impl StaController { @@
         }
         pub(super) async fn wait_for_command(&self) -> Command {
-            self.command_queue.recv().await
+            self.command_queue.receive().await
         }
     }
@@ Expand Down @@