From dee1d51ad3089b03c67aaa75c7985cf95ce90eec Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Fri, 7 Apr 2023 02:20:59 +0200
Subject: [PATCH] stm32: remove subghz feature.
It's available only on WL. if you're using a WL, you want subghz for sure.
---
embassy-lora/Cargo.toml | 2 +-
embassy-stm32/Cargo.toml | 1 -
embassy-stm32/src/lib.rs | 5 ++---
examples/stm32wl/Cargo.toml | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/embassy-lora/Cargo.toml b/embassy-lora/Cargo.toml
index c9174ea82..784cc228d 100644
--- a/embassy-lora/Cargo.toml
+++ b/embassy-lora/Cargo.toml
@@ -19,7 +19,7 @@ flavors = [
[features]
sx126x = []
sx127x = []
-stm32wl = ["embassy-stm32", "embassy-stm32/subghz"]
+stm32wl = ["dep:embassy-stm32"]
time = []
defmt = ["dep:defmt", "lorawan/defmt", "lorawan-device/defmt"]
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index 6710ff2d0..36ee58018 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -81,7 +81,6 @@ stm32-metapac = { version = "4", default-features = false, features = ["metadata
default = ["stm32-metapac/rt"]
defmt = ["dep:defmt", "bxcan/unstable-defmt", "embassy-sync/defmt", "embassy-executor/defmt", "embassy-embedded-hal/defmt", "embassy-hal-common/defmt", "embedded-io?/defmt", "embassy-usb-driver?/defmt", "embassy-net-driver/defmt"]
memory-x = ["stm32-metapac/memory-x"]
-subghz = []
exti = []
# Enables additional driver features that depend on embassy-time
diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs
index 3f2d078f8..d4d7155bd 100644
--- a/embassy-stm32/src/lib.rs
+++ b/embassy-stm32/src/lib.rs
@@ -53,6 +53,8 @@ pub mod rng;
pub mod sdmmc;
#[cfg(spi)]
pub mod spi;
+#[cfg(stm32wl)]
+pub mod subghz;
#[cfg(usart)]
pub mod usart;
#[cfg(all(usb, feature = "time"))]
@@ -62,9 +64,6 @@ pub mod usb_otg;
#[cfg(iwdg)]
pub mod wdg;
-#[cfg(feature = "subghz")]
-pub mod subghz;
-
// This must go last, so that it sees all the impl_foo! macros defined earlier.
pub(crate) mod _generated {
#![allow(dead_code)]
diff --git a/examples/stm32wl/Cargo.toml b/examples/stm32wl/Cargo.toml
index 9fc7e0f4a..0d2194ea2 100644
--- a/examples/stm32wl/Cargo.toml
+++ b/examples/stm32wl/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
embassy-sync = { version = "0.1.0", path = "../../embassy-sync", features = ["defmt"] }
embassy-executor = { version = "0.1.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] }
embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
-embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wl55jc-cm4", "time-driver-any", "memory-x", "subghz", "unstable-pac", "exti"] }
+embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wl55jc-cm4", "time-driver-any", "memory-x", "unstable-pac", "exti"] }
embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time", "defmt"] }
lorawan-device = { version = "0.8.0", default-features = false, features = ["async"] }