Update everything to use latest esp-hal and `embedded-hal-async 1.0…

….0`, smoltcp to `0.11.0` (#417) * Update everything to use latest esp-hal * Change to upstream as PR is merged * Remove hard dep on backtrace * Add required feature for heapless * Update examples * Update * update rev * Remove patches to crates as they are released * Remove last patch as is released * Update changelog
esp-rs · Jan 29, 2024 · 6f61d3a · 6f61d3a
1 parent 358dca4
commit 6f61d3a
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Update driver blobs (#410)
+- Update dependencies to fit `embedded-hal` `1.0`
 
 ### Removed
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,13 +1,6 @@
 [workspace]
-members = [
-    "esp-wifi",
-    "esp-wifi-sys",
-    "xtask",
-]
-exclude = [
-    "extras/bench-server",
-    "extras/esp-wifishark",
-]
+members = ["esp-wifi", "esp-wifi-sys", "xtask"]
+exclude = ["extras/bench-server", "extras/esp-wifishark"]
 resolver = "2"
 
 [profile.release]
@@ -16,24 +9,31 @@ debug = true
 
 [workspace.dependencies]
 defmt = "=0.3.5"
-esp32c3-hal = { version = "0.14.0", default-features = false }
-esp32c2-hal = { version = "0.12.0", default-features = false }
-esp32c6-hal = { version = "0.7.0",  default-features = false }
-esp32h2-hal = { version = "0.5.0", default-features = false }
-esp32-hal   = { version = "0.17.0", default-features = false }
-esp32s3-hal = { version = "0.14.0", default-features = false }
-esp32s2-hal = { version = "0.14.0", default-features = false }
-smoltcp = { version = "0.10.0", default-features=false, features = ["medium-ethernet", "socket-raw"] }
+esp32c3-hal = { version = "0.15.0", default-features = false }
+esp32c2-hal = { version = "0.13.0", default-features = false }
+esp32c6-hal = { version = "0.8.0", default-features = false }
+esp32h2-hal = { version = "0.6.0", default-features = false }
+esp32-hal = { version = "0.18.0", default-features = false }
+esp32s3-hal = { version = "0.15.0", default-features = false }
+esp32s2-hal = { version = "0.15.0", default-features = false }
+smoltcp = { version = "0.11.0", default-features = false, features = [
+    "medium-ethernet",
+    "socket-raw",
+] }
 critical-section = "1.1.1"
 portable-atomic = { version = "1.5", default-features = false }
 portable_atomic_enum = { version = "0.3.0", features = ["portable-atomic"] }
 log = "0.4.20"
-embedded-svc = { version = "0.26.1", default-features = false, features = [] }
+embedded-svc = { version = "0.27.0", default-features = false, features = [] }
 enumset = { version = "1.1.3", default-features = false }
-linked_list_allocator = { version = "0.10.5", default-features = false, features = ["const_mut_refs"] }
-embedded-io = "0.6.1"
+linked_list_allocator = { version = "0.10.5", default-features = false, features = [
+    "const_mut_refs",
+] }
+embedded-io = { version = "0.6.1", default-features = false }
 fugit = "0.3.7"
-heapless = { version = "0.7.16", default-features = false }
+heapless = { version = "0.8", default-features = false, features = [
+    "portable-atomic",
+] }
 num-derive = { version = "0.4" }
 num-traits = { version = "0.2", default-features = false }
 esp-wifi-sys = { version = "0.1.0", path = "../esp-wifi-sys" }
@@ -45,25 +45,28 @@ cfg-if = "1.0.0"
 static_cell = { version = "2.0", features = ["nightly"] }
 
 embassy-net-driver = { version = "0.2" }
-embassy-net = { version = "0.3", features = ["tcp", "udp", "dhcpv4", "medium-ethernet"] }
-bleps = { git = "https://github.com/bjoernQ/bleps", package = "bleps", rev = "0db8fcb", features = ["macros"] }
-embassy-executor = { version = "0.4.0", package = "embassy-executor", features = ["nightly", "integrated-timers"] }
-embassy-time = { version = "0.2.0" }
-esp-println = { version = "0.7.0" }
-esp-backtrace = { version = "0.9.0", features = ["panic-handler", "exception-handler", "print-uart"] }
-embedded-hal-async = { version = "1.0.0-rc.2" }
+embassy-net = { version = "0.4.0", features = [
+    "tcp",
+    "udp",
+    "dhcpv4",
+    "medium-ethernet",
+] }
+bleps = { git = "https://github.com/bjoernQ/bleps", package = "bleps", rev = "0db8fcb", features = [
+    "macros",
+] }
+embassy-executor = { version = "0.5.0", package = "embassy-executor", features = [
+    "nightly",
+    "integrated-timers",
+] }
+embassy-time = { version = "0.3.0" }
+esp-println = { version = "0.8.0", default-features = false }
+esp-backtrace = { version = "0.10.0" }
+embedded-hal-async = { version = "1.0.0" }
 embedded-io-async = { version = "0.6.0" }
 
-futures-util = { version = "0.3.28", default-features = false, features = ["portable-atomic"] } # need this to activate portable-atomic on AtomicWaker even though we don't use it
-atomic-waker = { version = "1.1.2", default-features = false, features = ["portable-atomic"] } # need this to activate portable-atomic on AtomicWaker used by embedded-svc even though we don't use it
-
-[patch.crates-io]
-esp-hal-common = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp-hal-common" }
-esp32c2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32c2-hal" }
-esp32c3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32c3-hal" }
-esp32c6-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32c6-hal" }
-esp32h2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32h2-hal" }
-esp32-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32-hal" }
-esp32s3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32s3-hal" }
-esp32s2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "df1374dd1a2f93619d4899358e2d309ee5913bc1", package = "esp32s2-hal" }
-
+futures-util = { version = "0.3.28", default-features = false, features = [
+    "portable-atomic",
+] } # need this to activate portable-atomic on AtomicWaker even though we don't use it
+atomic-waker = { version = "1.1.2", default-features = false, features = [
+    "portable-atomic",
+] } # need this to activate portable-atomic on AtomicWaker used by embedded-svc even though we don't use it
diff --git a/esp-wifi/Cargo.toml b/esp-wifi/Cargo.toml
@@ -60,7 +60,11 @@ toml-cfg.workspace = true
 
 [dev-dependencies]
 esp-println = { workspace = true, features = ["log"] }
-esp-backtrace.workspace = true
+esp-backtrace = { workspace = true, features = [
+    "panic-handler",
+    "exception-handler",
+    "print-uart",
+] }
 embassy-executor.workspace = true
 embassy-time.workspace = true
 embassy-net.workspace = true

diff --git a/esp-wifi/examples/embassy_access_point.rs b/esp-wifi/examples/embassy_access_point.rs
@@ -50,7 +50,7 @@ async fn main(spawner: Spawner) -> ! {
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiApDevice).unwrap();
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let config = Config::ipv4_static(StaticConfigV4 {
         address: Ipv4Cidr::new(Ipv4Address::new(192, 168, 2, 1), 24),

diff --git a/esp-wifi/examples/embassy_access_point_with_sta.rs b/esp-wifi/examples/embassy_access_point_with_sta.rs
@@ -55,7 +55,7 @@ async fn main(spawner: Spawner) -> ! {
         esp_wifi::wifi::new_ap_sta(&init, wifi).unwrap();
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let ap_config = Config::ipv4_static(StaticConfigV4 {
         address: Ipv4Cidr::new(Ipv4Address::new(192, 168, 2, 1), 24),

diff --git a/esp-wifi/examples/embassy_bench.rs b/esp-wifi/examples/embassy_bench.rs
@@ -63,7 +63,7 @@ async fn main(spawner: Spawner) -> ! {
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiApDevice).unwrap();
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let config = Config::dhcpv4(Default::default());
 

diff --git a/esp-wifi/examples/embassy_ble.rs b/esp-wifi/examples/embassy_ble.rs
@@ -66,7 +66,7 @@ async fn main(_spawner: Spawner) -> ! {
     .unwrap();
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let mut bluetooth = peripherals.BT;
 

diff --git a/esp-wifi/examples/embassy_dhcp.rs b/esp-wifi/examples/embassy_dhcp.rs
@@ -51,7 +51,7 @@ async fn main(spawner: Spawner) -> ! {
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiStaDevice).unwrap();
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let config = Config::dhcpv4(Default::default());
 

diff --git a/esp-wifi/examples/embassy_esp_now.rs b/esp-wifi/examples/embassy_esp_now.rs
@@ -45,7 +45,7 @@ async fn main(_spawner: Spawner) -> ! {
     println!("esp-now version {}", esp_now.get_version().unwrap());
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let mut ticker = Ticker::every(Duration::from_secs(5));
     loop {

diff --git a/esp-wifi/examples/embassy_esp_now_duplex.rs b/esp-wifi/examples/embassy_esp_now_duplex.rs
@@ -48,7 +48,7 @@ async fn main(spawner: Spawner) -> ! {
     println!("esp-now version {}", esp_now.get_version().unwrap());
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let (manager, sender, receiver) = esp_now.split();
     let manager = make_static!(manager);

diff --git a/esp-wifi/src/wifi/mod.rs b/esp-wifi/src/wifi/mod.rs
@@ -1269,7 +1269,7 @@ fn convert_ap_info(record: &include::wifi_ap_record_t) -> AccessPointInfo {
         },
         signal_strength: record.rssi,
         protocols: EnumSet::empty(), // TODO
-        auth_method: AuthMethod::from_raw(record.authmode),
+        auth_method: Some(AuthMethod::from_raw(record.authmode)),
     }
 }