aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-04-07 02:20:59 +0200
committerDario Nieuwenhuis <[email protected]>2023-04-07 02:28:36 +0200
commitdee1d51ad3089b03c67aaa75c7985cf95ce90eec (patch)
tree2eac1f8676ec45fccce5fd8381caf1e74a196303
parentda8258b7673a52a4639818f9c3f3b7ea241b4799 (diff)
stm32: remove subghz feature.
It's available only on WL. if you're using a WL, you want subghz for sure.
-rw-r--r--embassy-lora/Cargo.toml2
-rw-r--r--embassy-stm32/Cargo.toml1
-rw-r--r--embassy-stm32/src/lib.rs5
-rw-r--r--examples/stm32wl/Cargo.toml2
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 = [
19[features] 19[features]
20sx126x = [] 20sx126x = []
21sx127x = [] 21sx127x = []
22stm32wl = ["embassy-stm32", "embassy-stm32/subghz"] 22stm32wl = ["dep:embassy-stm32"]
23time = [] 23time = []
24defmt = ["dep:defmt", "lorawan/defmt", "lorawan-device/defmt"] 24defmt = ["dep:defmt", "lorawan/defmt", "lorawan-device/defmt"]
25 25
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
81default = ["stm32-metapac/rt"] 81default = ["stm32-metapac/rt"]
82defmt = ["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"] 82defmt = ["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"]
83memory-x = ["stm32-metapac/memory-x"] 83memory-x = ["stm32-metapac/memory-x"]
84subghz = []
85exti = [] 84exti = []
86 85
87# Enables additional driver features that depend on embassy-time 86# 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;
53pub mod sdmmc; 53pub mod sdmmc;
54#[cfg(spi)] 54#[cfg(spi)]
55pub mod spi; 55pub mod spi;
56#[cfg(stm32wl)]
57pub mod subghz;
56#[cfg(usart)] 58#[cfg(usart)]
57pub mod usart; 59pub mod usart;
58#[cfg(all(usb, feature = "time"))] 60#[cfg(all(usb, feature = "time"))]
@@ -62,9 +64,6 @@ pub mod usb_otg;
62#[cfg(iwdg)] 64#[cfg(iwdg)]
63pub mod wdg; 65pub mod wdg;
64 66
65#[cfg(feature = "subghz")]
66pub mod subghz;
67
68// This must go last, so that it sees all the impl_foo! macros defined earlier. 67// This must go last, so that it sees all the impl_foo! macros defined earlier.
69pub(crate) mod _generated { 68pub(crate) mod _generated {
70 #![allow(dead_code)] 69 #![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"
8embassy-sync = { version = "0.1.0", path = "../../embassy-sync", features = ["defmt"] } 8embassy-sync = { version = "0.1.0", path = "../../embassy-sync", features = ["defmt"] }
9embassy-executor = { version = "0.1.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } 9embassy-executor = { version = "0.1.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] }
10embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } 10embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
11embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wl55jc-cm4", "time-driver-any", "memory-x", "subghz", "unstable-pac", "exti"] } 11embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wl55jc-cm4", "time-driver-any", "memory-x", "unstable-pac", "exti"] }
12embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time", "defmt"] } 12embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time", "defmt"] }
13 13
14lorawan-device = { version = "0.8.0", default-features = false, features = ["async"] } 14lorawan-device = { version = "0.8.0", default-features = false, features = ["async"] }