Updated to embassy-net >=0.6 and embassy-time >=0.4, which has a brea…

…king change.
sammhicks · Jan 20, 2025 · 3efdb42 · 3efdb42
1 parent bf13b4c
commit 3efdb42
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Breaking
+
+- Updated to embassy-net >=0.6 and embassy-time >=0.4, which has a breaking change.
+
 ### Added
 
 - Added derivable trait [`ErrorWithStatusCode`](https://docs.rs/picoserve/latest/picoserve/response/trait.ErrorWithStatusCode.html) to facilitate creating error responses. Deriving `ErrorWithStatusCode` also derives [`IntoResponse`](https://docs.rs/picoserve/latest/picoserve/response/trait.IntoResponse.html)

diff --git a/examples/embassy/Cargo.toml b/examples/embassy/Cargo.toml
@@ -13,19 +13,19 @@ exclude = [
 
 [workspace.dependencies]
 cortex-m-rt = "0.7.3"
-cyw43 = { version = "0.2.0", features = ["firmware-logs"] }
-cyw43-pio = "0.2.0"
-embassy-executor = { version = "0.6.3", features = ["arch-cortex-m", "executor-thread", "integrated-timers", "nightly"] }
+cyw43 = { version = "0.3.0", features = ["firmware-logs"] }
+cyw43-pio = "0.3.0"
+embassy-executor = { version = "0.7.0", features = ["arch-cortex-m", "executor-thread", "nightly"] }
 embassy-futures = "0.1.1"
-embassy-net = { version = "0.5.0", features = ["tcp", "proto-ipv4", "medium-ethernet"] }
-embassy-rp = { version = "0.2.0", features = ["critical-section-impl", "time-driver"] }
+embassy-net = { version = "0.6.0", features = ["tcp", "proto-ipv4", "medium-ethernet"] }
+embassy-rp = { version = "0.3.0", features = ["rp2040", "critical-section-impl", "time-driver"] }
 embassy-sync = "0.6.0"
-embassy-time = "0.3.1"
-embassy-usb-logger = "0.2.0"
+embassy-time = "0.4.0"
+embassy-usb-logger = "0.4.0"
 embedded-io-async = "0.6.1"
 log = { version = "0.4.22", default-features = false }
 panic-persist = { version = "0.3.0", features = ["utf8"] }
-picoserve = { path = "../../picoserve", features = ["embassy"] }
+picoserve = { path = "../../picoserve", features = ["embassy", "log"] }
 portable-atomic = { version = "1.7.0", features = ["critical-section"], default-features = false }
 rand = { version = "0.8.5", default-features = false }
 static_cell = "2.1.0"
diff --git a/examples/embassy/app_with_props/src/main.rs b/examples/embassy/app_with_props/src/main.rs
@@ -100,6 +100,7 @@ async fn main(spawner: embassy_executor::Spawner) {
     let spi = cyw43_pio::PioSpi::new(
         &mut pio.common,
         pio.sm0,
+        cyw43_pio::DEFAULT_CLOCK_DIVIDER,
         pio.irq0,
         cs,
         p.PIN_24,

diff --git a/examples/embassy/cyw43-firmware/43439A0.bin b/examples/embassy/cyw43-firmware/43439A0.bin
diff --git a/examples/embassy/cyw43-firmware/43439A0_clm.bin b/examples/embassy/cyw43-firmware/43439A0_clm.bin
diff --git a/examples/embassy/hello_world/src/main.rs b/examples/embassy/hello_world/src/main.rs
@@ -96,6 +96,7 @@ async fn main(spawner: embassy_executor::Spawner) {
     let spi = cyw43_pio::PioSpi::new(
         &mut pio.common,
         pio.sm0,
+        cyw43_pio::DEFAULT_CLOCK_DIVIDER,
         pio.irq0,
         cs,
         p.PIN_24,

diff --git a/examples/embassy/hello_world_defmt/src/main.rs b/examples/embassy/hello_world_defmt/src/main.rs
@@ -81,6 +81,7 @@ async fn main(spawner: embassy_executor::Spawner) {
     let spi = cyw43_pio::PioSpi::new(
         &mut pio.common,
         pio.sm0,
+        cyw43_pio::DEFAULT_CLOCK_DIVIDER,
         pio.irq0,
         cs,
         p.PIN_24,

diff --git a/examples/embassy/set_pico_w_led/src/main.rs b/examples/embassy/set_pico_w_led/src/main.rs
@@ -144,6 +144,7 @@ async fn main(spawner: embassy_executor::Spawner) {
     let spi = cyw43_pio::PioSpi::new(
         &mut pio.common,
         pio.sm0,
+        cyw43_pio::DEFAULT_CLOCK_DIVIDER,
         pio.irq0,
         cs,
         p.PIN_24,

diff --git a/examples/embassy/web_sockets/src/main.rs b/examples/embassy/web_sockets/src/main.rs
@@ -161,6 +161,7 @@ async fn main(spawner: embassy_executor::Spawner) {
     let spi = cyw43_pio::PioSpi::new(
         &mut pio.common,
         pio.sm0,
+        cyw43_pio::DEFAULT_CLOCK_DIVIDER,
         pio.irq0,
         cs,
         p.PIN_24,

diff --git a/picoserve/Cargo.toml b/picoserve/Cargo.toml
@@ -17,8 +17,8 @@ categories = ["asynchronous", "network-programming", "web-programming::http-serv
 const-sha1 = { version = "0.3.0", default-features = false }
 data-encoding = { version = "2.4.0", default-features = false }
 defmt = { version = "0.3.6", optional = true }
-embassy-net = { version = "0.5.0", optional = true, features = ["tcp", "proto-ipv4", "medium-ethernet"] }
-embassy-time = { version = "0.3.0", optional = true }
+embassy-net = { version = ">=0.6.0", optional = true, features = ["tcp", "proto-ipv4", "medium-ethernet"] }
+embassy-time = { version = ">=0.4.0", optional = true }
 embedded-io-async = "0.6.0"
 futures-util = { version = "0.3.28", default-features = false }
 heapless = { version = "0.8.0", features = ["serde"] }