From 1dfdd5ed2a95dabf79d137eec048ab48c087e893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Tue, 2 Dec 2025 17:28:07 +0100 Subject: [PATCH 1/2] Remove dependency on esp-hal/unstable --- esp-radio/CHANGELOG.md | 1 + esp-radio/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/esp-radio/CHANGELOG.md b/esp-radio/CHANGELOG.md index 04978257d0..95180b39ba 100644 --- a/esp-radio/CHANGELOG.md +++ b/esp-radio/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- `esp-radio` no longer (directly) requires unstable `esp-hal` features (#4601) - `phy_calibration_data` and `set_phy_calibration_data` are now marked as `unstable`. (#4463) - The `InitializationError::General` is replaced by `InitializationError::Internal` (#4467) - The `WifiError::InternalError` is removed and `InternalWifiError` was folded into `WifiError`, some variants renamed for clarity (#4467) diff --git a/esp-radio/Cargo.toml b/esp-radio/Cargo.toml index 3d8c44d5bd..cde1fdcfc1 100644 --- a/esp-radio/Cargo.toml +++ b/esp-radio/Cargo.toml @@ -41,7 +41,7 @@ test = false [dependencies] cfg-if = "1" -esp-hal = { version = "1.0.0", path = "../esp-hal", default-features = false, features = ["requires-unstable"] } +esp-hal = { version = "1.0.0", path = "../esp-hal", default-features = false } portable-atomic = { version = "1.11", default-features = false } enumset = { version = "1.1", default-features = false, optional = true } critical-section = { version = "1", default-features = false } From f08489c725a3f703c02fbd8bbba94614c576fd18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Tue, 2 Dec 2025 17:37:16 +0100 Subject: [PATCH 2/2] Check without enabling esp-hal/unstable --- esp-radio/Cargo.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/esp-radio/Cargo.toml b/esp-radio/Cargo.toml index cde1fdcfc1..61b46a8b56 100644 --- a/esp-radio/Cargo.toml +++ b/esp-radio/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/esp-rs/esp-hal" license = "MIT OR Apache-2.0" [package.metadata.espressif] -doc-config = { features = ["esp-hal/unstable", "esp-hal/rt", "defmt"], append = [ +doc-config = { features = ["esp-hal/rt", "defmt"], append = [ { if = 'chip_has("wifi")', features = ["wifi", "wifi-eap", "esp-now", "sniffer", "smoltcp/proto-ipv4", "smoltcp/proto-ipv6"] }, { if = 'chip_has("bt")', features = ["ble"] }, { if = 'chip_has("ieee802154")', features = ["ieee802154", "__docs_build"] }, @@ -19,18 +19,18 @@ doc-config = { features = ["esp-hal/unstable", "esp-hal/rt", "defmt"], append = { if = 'chip_has("wifi") || chip_has("bt") || chip_has("ieee802154")', features = ["unstable"] }, ] } check-configs = [ - { features = ["esp-hal/unstable", "esp-hal/rt"] }, - { features = ["esp-hal/unstable", "esp-hal/rt", "defmt"] }, - { features = ["esp-hal/unstable", "esp-hal/rt", "wifi"], if = 'chip_has("wifi")' }, - { features = ["esp-hal/unstable", "esp-hal/rt", "unstable", "defmt", "wifi", "wifi-eap", "esp-now", "sniffer", "smoltcp/proto-ipv4", "smoltcp/proto-ipv6"], if = 'chip_has("wifi")' }, - { features = ["esp-hal/unstable", "esp-hal/rt", "unstable", "ble"], if = 'chip_has("bt")' }, - { features = ["esp-hal/unstable", "esp-hal/rt", "unstable", "ieee802154"], if = 'chip_has("ieee802154")' }, - { features = ["esp-hal/unstable", "esp-hal/rt", "unstable", "defmt", "wifi", "wifi-eap", "esp-now", "sniffer", "smoltcp/proto-ipv4", "smoltcp/proto-ipv6", "ble", "coex"], if = 'chip_has("wifi") && chip_has("bt")' }, - { features = ["esp-hal/unstable", "esp-hal/rt", "wifi-eap", "unstable"], if = 'chip_has("wifi")' }, + { features = ["esp-hal/rt"] }, + { features = ["esp-hal/rt", "defmt"] }, + { features = ["esp-hal/rt", "wifi"], if = 'chip_has("wifi")' }, + { features = ["esp-hal/rt", "unstable", "defmt", "wifi", "wifi-eap", "esp-now", "sniffer", "smoltcp/proto-ipv4", "smoltcp/proto-ipv6"], if = 'chip_has("wifi")' }, + { features = ["esp-hal/rt", "unstable", "ble"], if = 'chip_has("bt")' }, + { features = ["esp-hal/rt", "unstable", "ieee802154"], if = 'chip_has("ieee802154")' }, + { features = ["esp-hal/rt", "unstable", "defmt", "wifi", "wifi-eap", "esp-now", "sniffer", "smoltcp/proto-ipv4", "smoltcp/proto-ipv6", "ble", "coex"], if = 'chip_has("wifi") && chip_has("bt")' }, + { features = ["esp-hal/rt", "wifi-eap", "unstable"], if = 'chip_has("wifi")' }, ] clippy-configs = [ - { features = ["esp-hal/unstable", "esp-hal/rt"] }, - { features = ["esp-hal/unstable", "esp-hal/rt", "wifi", "wifi-eap", "unstable"], if = 'chip_has("wifi")', append = [ + { features = ["esp-hal/rt"] }, + { features = ["esp-hal/rt", "wifi", "wifi-eap", "unstable"], if = 'chip_has("wifi")', append = [ { features = ["ble"], if = 'chip_has("bt")' }, ] }, ]