diff options
| -rw-r--r-- | embassy-nrf/src/chips/nrf5340_app.rs | 8 | ||||
| -rw-r--r-- | embassy-nrf/src/lib.rs | 18 |
2 files changed, 9 insertions, 17 deletions
diff --git a/embassy-nrf/src/chips/nrf5340_app.rs b/embassy-nrf/src/chips/nrf5340_app.rs index b33a19df7..86274bf48 100644 --- a/embassy-nrf/src/chips/nrf5340_app.rs +++ b/embassy-nrf/src/chips/nrf5340_app.rs | |||
| @@ -262,9 +262,9 @@ embassy_hal_internal::peripherals! { | |||
| 262 | PPI_GROUP5, | 262 | PPI_GROUP5, |
| 263 | 263 | ||
| 264 | // GPIO port 0 | 264 | // GPIO port 0 |
| 265 | #[cfg(any(not(feature = "_nrf5340"), feature = "lfxo-pins-as-gpio"))] | 265 | #[cfg(feature = "lfxo-pins-as-gpio")] |
| 266 | P0_00, | 266 | P0_00, |
| 267 | #[cfg(any(not(feature = "_nrf5340"), feature = "lfxo-pins-as-gpio"))] | 267 | #[cfg(feature = "lfxo-pins-as-gpio")] |
| 268 | P0_01, | 268 | P0_01, |
| 269 | #[cfg(feature = "nfc-pins-as-gpio")] | 269 | #[cfg(feature = "nfc-pins-as-gpio")] |
| 270 | P0_02, | 270 | P0_02, |
| @@ -370,9 +370,9 @@ impl_pdm!(PDM0, PDM0, PDM0); | |||
| 370 | impl_qdec!(QDEC0, QDEC0, QDEC0); | 370 | impl_qdec!(QDEC0, QDEC0, QDEC0); |
| 371 | impl_qdec!(QDEC1, QDEC1, QDEC1); | 371 | impl_qdec!(QDEC1, QDEC1, QDEC1); |
| 372 | 372 | ||
| 373 | #[cfg(any(not(feature = "_nrf5340"), feature = "lfxo-pins-as-gpio"))] | 373 | #[cfg(feature = "lfxo-pins-as-gpio")] |
| 374 | impl_pin!(P0_00, 0, 0); | 374 | impl_pin!(P0_00, 0, 0); |
| 375 | #[cfg(any(not(feature = "_nrf5340"), feature = "lfxo-pins-as-gpio"))] | 375 | #[cfg(feature = "lfxo-pins-as-gpio")] |
| 376 | impl_pin!(P0_01, 0, 1); | 376 | impl_pin!(P0_01, 0, 1); |
| 377 | #[cfg(feature = "nfc-pins-as-gpio")] | 377 | #[cfg(feature = "nfc-pins-as-gpio")] |
| 378 | impl_pin!(P0_02, 0, 2); | 378 | impl_pin!(P0_02, 0, 2); |
diff --git a/embassy-nrf/src/lib.rs b/embassy-nrf/src/lib.rs index 4241f90b1..23888b390 100644 --- a/embassy-nrf/src/lib.rs +++ b/embassy-nrf/src/lib.rs | |||
| @@ -65,7 +65,7 @@ compile_error!("feature `reset-pin-as-gpio` is only valid for nRF52 series chips | |||
| 65 | #[cfg(all(feature = "nfc-pins-as-gpio", not(any(feature = "_nrf52", feature = "_nrf5340-app"))))] | 65 | #[cfg(all(feature = "nfc-pins-as-gpio", not(any(feature = "_nrf52", feature = "_nrf5340-app"))))] |
| 66 | compile_error!("feature `nfc-pins-as-gpio` is only valid for nRF52, or nRF53's application core."); | 66 | compile_error!("feature `nfc-pins-as-gpio` is only valid for nRF52, or nRF53's application core."); |
| 67 | 67 | ||
| 68 | #[cfg(all(feature = "lfxo-pins-as-gpio", not(any(feature = "_nrf5340"))))] | 68 | #[cfg(all(feature = "lfxo-pins-as-gpio", not(feature = "_nrf5340")))] |
| 69 | compile_error!("feature `lfxo-pins-as-gpio` is only valid for nRF53 series chips."); | 69 | compile_error!("feature `lfxo-pins-as-gpio` is only valid for nRF53 series chips."); |
| 70 | 70 | ||
| 71 | // This mod MUST go first, so that the others see its macros. | 71 | // This mod MUST go first, so that the others see its macros. |
| @@ -285,24 +285,16 @@ pub mod config { | |||
| 285 | /// Internal RC oscillator | 285 | /// Internal RC oscillator |
| 286 | InternalRC, | 286 | InternalRC, |
| 287 | /// Synthesized from the high frequency clock source. | 287 | /// Synthesized from the high frequency clock source. |
| 288 | #[cfg(not(any(feature = "_nrf91")))] | 288 | #[cfg(not(feature = "_nrf91"))] |
| 289 | Synthesized, | 289 | Synthesized, |
| 290 | /// External source from xtal. | 290 | /// External source from xtal. |
| 291 | #[cfg(not(all(feature = "_nrf5340", feature = "lfxo-pins-as-gpio")))] | 291 | #[cfg(not(feature = "lfxo-pins-as-gpio"))] |
| 292 | ExternalXtal, | 292 | ExternalXtal, |
| 293 | /// External source from xtal with low swing applied. | 293 | /// External source from xtal with low swing applied. |
| 294 | #[cfg(not(any( | 294 | #[cfg(not(any(feature = "lfxo-pins-as-gpio", feature = "_nrf91", feature = "_nrf54l")))] |
| 295 | all(feature = "_nrf5340", feature = "lfxo-pins-as-gpio"), | ||
| 296 | feature = "_nrf91", | ||
| 297 | feature = "_nrf54l" | ||
| 298 | )))] | ||
| 299 | ExternalLowSwing, | 295 | ExternalLowSwing, |
| 300 | /// External source from xtal with full swing applied. | 296 | /// External source from xtal with full swing applied. |
| 301 | #[cfg(not(any( | 297 | #[cfg(not(any(feature = "lfxo-pins-as-gpio", feature = "_nrf91", feature = "_nrf54l")))] |
| 302 | all(feature = "_nrf5340", feature = "lfxo-pins-as-gpio"), | ||
| 303 | feature = "_nrf91", | ||
| 304 | feature = "_nrf54l" | ||
| 305 | )))] | ||
| 306 | ExternalFullSwing, | 298 | ExternalFullSwing, |
| 307 | } | 299 | } |
| 308 | 300 | ||
