Don't enable default features for esp*-hal

esp-rs · Oct 24, 2023 · d8842b4 · d8842b4
1 parent 5578266
commit d8842b4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,12 +27,12 @@ lto = "off"
 
 [workspace.dependencies]
 defmt = "=0.3.5"
-esp32c3-hal = { version = "0.12.0" }
-esp32c2-hal = { version = "0.10.0" }
-esp32c6-hal = { version = "0.5.0" }
-esp32-hal   = { version = "0.15.0" }
-esp32s3-hal = { version = "0.12.0" }
-esp32s2-hal = { version = "0.12.0" }
+esp32c2-hal = { version = "0.10.0", default-features = false }
+esp32c3-hal = { version = "0.12.0", default-features = false }
+esp32c6-hal = { version = "0.5.0", default-features = false }
+esp32-hal   = { version = "0.15.0", default-features = false }
+esp32s2-hal = { version = "0.12.0", default-features = false }
+esp32s3-hal = { version = "0.12.0", default-features = false }
 smoltcp = { version = "0.10.0", default-features=false, features = ["proto-igmp", "proto-ipv4", "proto-dns", "socket-tcp", "socket-icmp", "socket-udp", "socket-dns", "medium-ethernet", "proto-dhcpv4", "socket-raw", "socket-dhcpv4"] }
 critical-section = "1.1.1"
 atomic-polyfill = "1.0.2"
@@ -66,4 +66,4 @@ embedded-hal-async = { version = "1.0.0-rc.1" }
 # patching esp32c6-hal for BLE - it would compile with 0.5.0 but not work
 [patch.crates-io]
 esp32c6-hal = { git = "https://github.com/esp-rs/esp-hal.git", rev = "4c34ebe9e264fcc31fabba862274adae8daa680a" }
-esp-hal-common = {  git = "https://github.com/esp-rs/esp-hal.git", rev = "4c34ebe9e264fcc31fabba862274adae8daa680a" }
+esp-hal-common = { git = "https://github.com/esp-rs/esp-hal.git", rev = "4c34ebe9e264fcc31fabba862274adae8daa680a" }
diff --git a/examples-esp32/Cargo.toml b/examples-esp32/Cargo.toml
@@ -29,7 +29,7 @@ esp-println = { workspace = true, features = ["esp32", "log"] }
 
 [features]
 default = ["esp32", "log"]
-esp32 = []
+esp32 = ["esp32-hal/rt", "esp32-hal/vectored", "esp32-hal/xtal40mhz"]
 async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32-hal/async", "esp32-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-xtensa"]
 embassy-net = ["esp-wifi/embassy-net","dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]

diff --git a/examples-esp32c2/Cargo.toml b/examples-esp32c2/Cargo.toml
@@ -29,7 +29,7 @@ esp-println = { workspace = true, features = [ "esp32c2", "log" ] }
 
 [features]
 default = ["esp32c2", "log"]
-esp32c2 = []
+esp32c2 = ["esp32c2-hal/rt", "esp32c2-hal/vectored", "esp32c2-hal/xtal40mhz"]
 async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32c2-hal/async", "esp32c2-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-riscv32"]
 embassy-net = ["esp-wifi/embassy-net","dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]

diff --git a/examples-esp32c3/Cargo.toml b/examples-esp32c3/Cargo.toml
@@ -20,6 +20,8 @@ embassy-net = { workspace = true, optional = true }
 embassy-sync.workspace = true
 
 esp32c3-hal.workspace = true
+esp-hal-common = { version = "0.12.0", default-features = false }
+
 esp-backtrace = { workspace = true, features = ["esp32c3"] }
 esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32c3", "utils"] }
 embedded-hal-async = { workspace = true, optional = true }
@@ -29,7 +31,7 @@ esp-println = { workspace = true, features = [ "esp32c3", "log" ] }
 
 [features]
 default = ["esp32c3", "log"]
-esp32c3 = []
+esp32c3 = ["esp32c3-hal/vectored", "esp32c3-hal/rt", "esp-hal-common/rv-zero-rtc-bss"]
 async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32c3-hal/async", "esp32c3-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-riscv32"]
 embassy-net = ["esp-wifi/embassy-net","dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]

diff --git a/examples-esp32c6/Cargo.toml b/examples-esp32c6/Cargo.toml
@@ -20,6 +20,8 @@ embassy-net = { workspace = true, optional = true }
 embassy-sync.workspace = true
 
 esp32c6-hal.workspace = true
+esp-hal-common = { version = "0.12.0", default-features = false }
+
 esp-backtrace = { workspace = true, features = ["esp32c6"] }
 esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32c6", "utils"] }
 embedded-hal-async = { workspace = true, optional = true }
@@ -29,7 +31,7 @@ esp-println = { workspace = true, features = [ "esp32c6", "log" ] }
 
 [features]
 default = ["esp32c6", "log"]
-esp32c6 = []
+esp32c6 = ["esp32c6-hal/vectored", "esp32c6-hal/rt", "esp-hal-common/rv-zero-rtc-bss"]
 async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32c6-hal/async", "esp32c6-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-riscv32"]
 embassy-net = ["esp-wifi/embassy-net", "dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]

diff --git a/examples-esp32s2/Cargo.toml b/examples-esp32s2/Cargo.toml
@@ -28,7 +28,7 @@ esp-println = { workspace = true, features = [ "esp32s2", "log" ] }
 
 [features]
 default = ["esp32s2", "log"]
-esp32s2 = []
+esp32s2 = ["esp32s2-hal/vectored", "esp32s2-hal/rt"]
 async = ["esp-wifi/async", "esp32s2-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-xtensa"]
 embassy-net = ["esp-wifi/embassy-net","dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]

diff --git a/examples-esp32s3/Cargo.toml b/examples-esp32s3/Cargo.toml
@@ -29,7 +29,7 @@ esp-println = { workspace = true, features = [ "esp32s3", "log" ] }
 
 [features]
 default = ["esp32s3", "log"]
-esp32s3 = []
+esp32s3 = ["esp32s3-hal/vectored", "esp32s3-hal/rt"]
 async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32s3-hal/async", "esp32s3-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-xtensa"]
 embassy-net = ["esp-wifi/embassy-net","dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]