LailaTheElf/embassy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove redundant cfg

Browse Source
This commit is contained in:
Matthew Tran 2025-02-22 08:45:11 -06:00
parent 1b4f788427
commit def1cf58ab
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
embassy-nrf/src/chips/nrf5340_app.rs
View File

@ -262,9 +262,9 @@ embassy_hal_internal::peripherals! {
PPI_GROUP5,
// GPIO port 0
#[cfg(any(not(feature = "_nrf5340"), feature = "lfxo-pins-as-gpio"))]
#[cfg(feature = "lfxo-pins-as-gpio")]
P0_00,
#[cfg(any(not(feature = "_nrf5340"), feature = "lfxo-pins-as-gpio"))]
#[cfg(feature = "lfxo-pins-as-gpio")]
P0_01,
#[cfg(feature = "nfc-pins-as-gpio")]
P0_02,
@ -370,9 +370,9 @@ impl_pdm!(PDM0, PDM0, PDM0);
impl_qdec!(QDEC0, QDEC0, QDEC0);
impl_qdec!(QDEC1, QDEC1, QDEC1);
#[cfg(any(not(feature = "_nrf5340"), feature = "lfxo-pins-as-gpio"))]
#[cfg(feature = "lfxo-pins-as-gpio")]
impl_pin!(P0_00, 0, 0);
#[cfg(any(not(feature = "_nrf5340"), feature = "lfxo-pins-as-gpio"))]
#[cfg(feature = "lfxo-pins-as-gpio")]
impl_pin!(P0_01, 0, 1);
#[cfg(feature = "nfc-pins-as-gpio")]
impl_pin!(P0_02, 0, 2);

18
embassy-nrf/src/lib.rs
View File

@ -65,7 +65,7 @@ compile_error!("feature `reset-pin-as-gpio` is only valid for nRF52 series chips
#[cfg(all(feature = "nfc-pins-as-gpio", not(any(feature = "_nrf52", feature = "_nrf5340-app"))))]
compile_error!("feature `nfc-pins-as-gpio` is only valid for nRF52, or nRF53's application core.");
#[cfg(all(feature = "lfxo-pins-as-gpio", not(any(feature = "_nrf5340"))))]
#[cfg(all(feature = "lfxo-pins-as-gpio", not(feature = "_nrf5340")))]
compile_error!("feature `lfxo-pins-as-gpio` is only valid for nRF53 series chips.");
// This mod MUST go first, so that the others see its macros.
@ -285,24 +285,16 @@ pub mod config {
/// Internal RC oscillator
InternalRC,
/// Synthesized from the high frequency clock source.
#[cfg(not(any(feature = "_nrf91")))]
#[cfg(not(feature = "_nrf91"))]
Synthesized,
/// External source from xtal.
#[cfg(not(all(feature = "_nrf5340", feature = "lfxo-pins-as-gpio")))]
#[cfg(not(feature = "lfxo-pins-as-gpio"))]
ExternalXtal,
/// External source from xtal with low swing applied.
#[cfg(not(any(
all(feature = "_nrf5340", feature = "lfxo-pins-as-gpio"),
feature = "_nrf91",
feature = "_nrf54l"
)))]
#[cfg(not(any(feature = "lfxo-pins-as-gpio", feature = "_nrf91", feature = "_nrf54l")))]
ExternalLowSwing,
/// External source from xtal with full swing applied.
#[cfg(not(any(
all(feature = "_nrf5340", feature = "lfxo-pins-as-gpio"),
feature = "_nrf91",
feature = "_nrf54l"
)))]
#[cfg(not(any(feature = "lfxo-pins-as-gpio", feature = "_nrf91", feature = "_nrf54l")))]
ExternalFullSwing,
}