From 28508a5f91eb8eb6d9b9a327f7bbc24340f1492e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Tue, 5 Sep 2023 12:45:29 +0200 Subject: [PATCH] Fix examples --- Cargo.toml | 2 +- examples-esp32/Cargo.toml | 6 +++--- examples-esp32c2/Cargo.toml | 6 +++--- examples-esp32c3/Cargo.toml | 6 +++--- examples-esp32c6/Cargo.toml | 6 +++--- examples-esp32s2/Cargo.toml | 6 +++--- examples-esp32s3/Cargo.toml | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4945a720..b2df5ece 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,6 +57,6 @@ bleps = { git = "https://github.com/bjoernQ/bleps", package = "bleps", rev = "b8 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 } -esp-println = { version = "0.6.0", features = ["log"] } +esp-println = { version = "0.6.0" } esp-backtrace = { version = "0.8.0", features = ["panic-handler", "exception-handler", "print-uart"] } embedded-hal-async = { version = "1.0.0-rc.1" } diff --git a/examples-esp32/Cargo.toml b/examples-esp32/Cargo.toml index 7f040057..c7aad5d5 100644 --- a/examples-esp32/Cargo.toml +++ b/examples-esp32/Cargo.toml @@ -21,7 +21,7 @@ embassy-net = { workspace = true, optional = true } esp32-hal.workspace = true examples-util = { path = "../examples-util", features = ["esp32"] } esp-backtrace = { workspace = true, features = ["esp32"] } -esp-wifi = { path = "../esp-wifi", features = ["esp32"] } +esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32", "utils"] } embedded-hal-async = { workspace = true, optional = true } [dev-dependencies] @@ -44,5 +44,5 @@ ps-min-modem = ["esp-wifi/ps-min-modem"] esp-now = ["esp-wifi/esp-now"] ipv6 = ["esp-wifi/ipv6"] coex = ["esp-wifi/coex"] -log = ["esp-wifi/log", "dep:log"] -defmt = ["esp-wifi/defmt"] +log = ["esp-wifi/log", "dep:log", "esp-println/log"] +defmt = ["esp-wifi/defmt", "esp-println/defmt"] diff --git a/examples-esp32c2/Cargo.toml b/examples-esp32c2/Cargo.toml index 973592f8..fdb361f0 100644 --- a/examples-esp32c2/Cargo.toml +++ b/examples-esp32c2/Cargo.toml @@ -21,7 +21,7 @@ embassy-net = { workspace = true, optional = true } esp32c2-hal.workspace = true examples-util = { path = "../examples-util", features = ["esp32c2"] } esp-backtrace = { workspace = true, features = ["esp32c2"] } -esp-wifi = { path = "../esp-wifi", features = ["esp32c2"] } +esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32c2", "utils"] } embedded-hal-async = { workspace = true, optional = true } [dev-dependencies] @@ -45,5 +45,5 @@ ps-min-modem = ["esp-wifi/ps-min-modem"] esp-now = ["esp-wifi/esp-now"] ipv6 = ["esp-wifi/ipv6"] #coex = ["esp-wifi/coex"] -log = ["esp-wifi/log", "dep:log"] -defmt = ["esp-wifi/defmt"] +log = ["esp-wifi/log", "dep:log", "esp-println/log"] +defmt = ["esp-wifi/defmt", "esp-println/defmt"] diff --git a/examples-esp32c3/Cargo.toml b/examples-esp32c3/Cargo.toml index 796347a9..9b68c8a2 100644 --- a/examples-esp32c3/Cargo.toml +++ b/examples-esp32c3/Cargo.toml @@ -21,7 +21,7 @@ embassy-net = { workspace = true, optional = true } esp32c3-hal.workspace = true examples-util = { path = "../examples-util", features = ["esp32c3"] } esp-backtrace = { workspace = true, features = ["esp32c3"] } -esp-wifi = { path = "../esp-wifi", features = ["esp32c3"] } +esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32c3", "utils"] } embedded-hal-async = { workspace = true, optional = true } [dev-dependencies] @@ -45,5 +45,5 @@ ps-min-modem = ["esp-wifi/ps-min-modem"] esp-now = ["esp-wifi/esp-now"] ipv6 = ["esp-wifi/ipv6"] coex = ["esp-wifi/coex"] -log = ["esp-wifi/log", "dep:log"] -defmt = ["esp-wifi/defmt"] +log = ["esp-wifi/log", "dep:log", "esp-println/log"] +defmt = ["esp-wifi/defmt", "esp-println/defmt"] diff --git a/examples-esp32c6/Cargo.toml b/examples-esp32c6/Cargo.toml index 2b8bab11..3b42a3ab 100644 --- a/examples-esp32c6/Cargo.toml +++ b/examples-esp32c6/Cargo.toml @@ -21,7 +21,7 @@ embassy-net = { workspace = true, optional = true } esp32c6-hal.workspace = true examples-util = { path = "../examples-util", features = ["esp32c6"] } esp-backtrace = { workspace = true, features = ["esp32c6"] } -esp-wifi = { path = "../esp-wifi", features = ["esp32c6"] } +esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32c6", "utils"] } [dev-dependencies] esp-println = { workspace = true, features = [ "esp32c6", "log" ] } @@ -44,5 +44,5 @@ ps-min-modem = ["esp-wifi/ps-min-modem"] esp-now = ["esp-wifi/esp-now"] ipv6 = ["esp-wifi/ipv6"] #coex = ["esp-wifi/coex"] -log = ["esp-wifi/log", "dep:log"] -defmt = ["esp-wifi/defmt"] +log = ["esp-wifi/log", "dep:log", "esp-println/log"] +defmt = ["esp-wifi/defmt", "esp-println/defmt"] diff --git a/examples-esp32s2/Cargo.toml b/examples-esp32s2/Cargo.toml index 93ce8d01..cc7c5fa8 100644 --- a/examples-esp32s2/Cargo.toml +++ b/examples-esp32s2/Cargo.toml @@ -21,7 +21,7 @@ embassy-net = { workspace = true, optional = true } esp32s2-hal.workspace = true examples-util = { path = "../examples-util", features = ["esp32s2"] } esp-backtrace = { workspace = true, features = ["esp32s2"] } -esp-wifi = { path = "../esp-wifi", features = ["esp32s2"] } +esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32s2", "utils"] } [dev-dependencies] esp-println = { workspace = true, features = [ "esp32s2", "log" ] } @@ -42,5 +42,5 @@ phy-enable-usb = ["esp-wifi/phy-enable-usb"] ps-min-modem = ["esp-wifi/ps-min-modem"] esp-now = ["esp-wifi/esp-now"] ipv6 = ["esp-wifi/ipv6"] -log = ["esp-wifi/log", "dep:log"] -defmt = ["esp-wifi/defmt"] +log = ["esp-wifi/log", "dep:log", "esp-println/log"] +defmt = ["esp-wifi/defmt", "esp-println/defmt"] diff --git a/examples-esp32s3/Cargo.toml b/examples-esp32s3/Cargo.toml index f9b9cdaa..5ddba6a8 100644 --- a/examples-esp32s3/Cargo.toml +++ b/examples-esp32s3/Cargo.toml @@ -21,7 +21,7 @@ embassy-net = { workspace = true, optional = true } esp32s3-hal.workspace = true examples-util = { path = "../examples-util", features = ["esp32s3"] } esp-backtrace = { workspace = true, features = ["esp32s3"] } -esp-wifi = { path = "../esp-wifi", features = ["esp32s3"] } +esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32s3", "utils"] } embedded-hal-async = { workspace = true, optional = true } [dev-dependencies] @@ -45,5 +45,5 @@ ps-min-modem = ["esp-wifi/ps-min-modem"] esp-now = ["esp-wifi/esp-now"] ipv6 = ["esp-wifi/ipv6"] coex = ["esp-wifi/coex"] -log = ["esp-wifi/log", "dep:log"] -defmt = ["esp-wifi/defmt"] +log = ["esp-wifi/log", "dep:log", "esp-println/log"] +defmt = ["esp-wifi/defmt", "esp-println/defmt"]