diff options
| author | Ulf Lilleengen <[email protected]> | 2025-10-29 13:46:33 +0100 |
|---|---|---|
| committer | Ulf Lilleengen <[email protected]> | 2025-10-29 13:46:33 +0100 |
| commit | 85ee62fa7c0d00fc50677e94f5c02d4f52b601fc (patch) | |
| tree | 9db07fe45966e769f40ce0736fd24d737bc27a23 /embassy-nrf | |
| parent | 1f68530bc87a45f7abbc01379b78d5d48f524efa (diff) | |
fix: allow compiling without gpiote for nrf54
Diffstat (limited to 'embassy-nrf')
| -rw-r--r-- | embassy-nrf/src/chips/nrf54l15_app.rs | 55 | ||||
| -rw-r--r-- | embassy-nrf/src/gpiote.rs | 2 |
2 files changed, 30 insertions, 27 deletions
diff --git a/embassy-nrf/src/chips/nrf54l15_app.rs b/embassy-nrf/src/chips/nrf54l15_app.rs index e063152d6..d635bb418 100644 --- a/embassy-nrf/src/chips/nrf54l15_app.rs +++ b/embassy-nrf/src/chips/nrf54l15_app.rs | |||
| @@ -386,13 +386,6 @@ impl_pin!(P0_03, 0, 3); | |||
| 386 | impl_pin!(P0_04, 0, 4); | 386 | impl_pin!(P0_04, 0, 4); |
| 387 | impl_pin!(P0_05, 0, 5); | 387 | impl_pin!(P0_05, 0, 5); |
| 388 | impl_pin!(P0_06, 0, 6); | 388 | impl_pin!(P0_06, 0, 6); |
| 389 | impl_gpiote_pin!(P0_00, GPIOTE30); | ||
| 390 | impl_gpiote_pin!(P0_01, GPIOTE30); | ||
| 391 | impl_gpiote_pin!(P0_02, GPIOTE30); | ||
| 392 | impl_gpiote_pin!(P0_03, GPIOTE30); | ||
| 393 | impl_gpiote_pin!(P0_04, GPIOTE30); | ||
| 394 | impl_gpiote_pin!(P0_05, GPIOTE30); | ||
| 395 | impl_gpiote_pin!(P0_06, GPIOTE30); | ||
| 396 | 389 | ||
| 397 | impl_pin!(P1_00, 1, 0); | 390 | impl_pin!(P1_00, 1, 0); |
| 398 | impl_pin!(P1_01, 1, 1); | 391 | impl_pin!(P1_01, 1, 1); |
| @@ -412,24 +405,6 @@ impl_pin!(P1_14, 1, 14); | |||
| 412 | impl_pin!(P1_15, 1, 15); | 405 | impl_pin!(P1_15, 1, 15); |
| 413 | impl_pin!(P1_16, 1, 16); | 406 | impl_pin!(P1_16, 1, 16); |
| 414 | 407 | ||
| 415 | impl_gpiote_pin!(P1_00, GPIOTE20); | ||
| 416 | impl_gpiote_pin!(P1_01, GPIOTE20); | ||
| 417 | impl_gpiote_pin!(P1_02, GPIOTE20); | ||
| 418 | impl_gpiote_pin!(P1_03, GPIOTE20); | ||
| 419 | impl_gpiote_pin!(P1_04, GPIOTE20); | ||
| 420 | impl_gpiote_pin!(P1_05, GPIOTE20); | ||
| 421 | impl_gpiote_pin!(P1_06, GPIOTE20); | ||
| 422 | impl_gpiote_pin!(P1_07, GPIOTE20); | ||
| 423 | impl_gpiote_pin!(P1_08, GPIOTE20); | ||
| 424 | impl_gpiote_pin!(P1_09, GPIOTE20); | ||
| 425 | impl_gpiote_pin!(P1_10, GPIOTE20); | ||
| 426 | impl_gpiote_pin!(P1_11, GPIOTE20); | ||
| 427 | impl_gpiote_pin!(P1_12, GPIOTE20); | ||
| 428 | impl_gpiote_pin!(P1_13, GPIOTE20); | ||
| 429 | impl_gpiote_pin!(P1_14, GPIOTE20); | ||
| 430 | impl_gpiote_pin!(P1_15, GPIOTE20); | ||
| 431 | impl_gpiote_pin!(P1_16, GPIOTE20); | ||
| 432 | |||
| 433 | impl_pin!(P2_00, 2, 0); | 408 | impl_pin!(P2_00, 2, 0); |
| 434 | impl_pin!(P2_01, 2, 1); | 409 | impl_pin!(P2_01, 2, 1); |
| 435 | impl_pin!(P2_02, 2, 2); | 410 | impl_pin!(P2_02, 2, 2); |
| @@ -442,6 +417,36 @@ impl_pin!(P2_08, 2, 8); | |||
| 442 | impl_pin!(P2_09, 2, 9); | 417 | impl_pin!(P2_09, 2, 9); |
| 443 | impl_pin!(P2_10, 2, 10); | 418 | impl_pin!(P2_10, 2, 10); |
| 444 | 419 | ||
| 420 | cfg_if::cfg_if! { | ||
| 421 | if #[cfg(feature = "gpiote")] { | ||
| 422 | impl_gpiote_pin!(P0_00, GPIOTE30); | ||
| 423 | impl_gpiote_pin!(P0_01, GPIOTE30); | ||
| 424 | impl_gpiote_pin!(P0_02, GPIOTE30); | ||
| 425 | impl_gpiote_pin!(P0_03, GPIOTE30); | ||
| 426 | impl_gpiote_pin!(P0_04, GPIOTE30); | ||
| 427 | impl_gpiote_pin!(P0_05, GPIOTE30); | ||
| 428 | impl_gpiote_pin!(P0_06, GPIOTE30); | ||
| 429 | |||
| 430 | impl_gpiote_pin!(P1_00, GPIOTE20); | ||
| 431 | impl_gpiote_pin!(P1_01, GPIOTE20); | ||
| 432 | impl_gpiote_pin!(P1_02, GPIOTE20); | ||
| 433 | impl_gpiote_pin!(P1_03, GPIOTE20); | ||
| 434 | impl_gpiote_pin!(P1_04, GPIOTE20); | ||
| 435 | impl_gpiote_pin!(P1_05, GPIOTE20); | ||
| 436 | impl_gpiote_pin!(P1_06, GPIOTE20); | ||
| 437 | impl_gpiote_pin!(P1_07, GPIOTE20); | ||
| 438 | impl_gpiote_pin!(P1_08, GPIOTE20); | ||
| 439 | impl_gpiote_pin!(P1_09, GPIOTE20); | ||
| 440 | impl_gpiote_pin!(P1_10, GPIOTE20); | ||
| 441 | impl_gpiote_pin!(P1_11, GPIOTE20); | ||
| 442 | impl_gpiote_pin!(P1_12, GPIOTE20); | ||
| 443 | impl_gpiote_pin!(P1_13, GPIOTE20); | ||
| 444 | impl_gpiote_pin!(P1_14, GPIOTE20); | ||
| 445 | impl_gpiote_pin!(P1_15, GPIOTE20); | ||
| 446 | impl_gpiote_pin!(P1_16, GPIOTE20); | ||
| 447 | } | ||
| 448 | } | ||
| 449 | |||
| 445 | impl_rtc!(RTC10, RTC10, RTC10); | 450 | impl_rtc!(RTC10, RTC10, RTC10); |
| 446 | impl_rtc!(RTC30, RTC30, RTC30); | 451 | impl_rtc!(RTC30, RTC30, RTC30); |
| 447 | 452 | ||
diff --git a/embassy-nrf/src/gpiote.rs b/embassy-nrf/src/gpiote.rs index 060950132..b1e7359f6 100644 --- a/embassy-nrf/src/gpiote.rs +++ b/embassy-nrf/src/gpiote.rs | |||
| @@ -726,9 +726,7 @@ cfg_if::cfg_if! { | |||
| 726 | 726 | ||
| 727 | macro_rules! impl_gpiote_pin { | 727 | macro_rules! impl_gpiote_pin { |
| 728 | ($type:ident, $inst:ident) => { | 728 | ($type:ident, $inst:ident) => { |
| 729 | #[cfg(feature = "gpiote")] | ||
| 730 | impl crate::gpiote::SealedGpiotePin for peripherals::$type {} | 729 | impl crate::gpiote::SealedGpiotePin for peripherals::$type {} |
| 731 | #[cfg(feature = "gpiote")] | ||
| 732 | impl crate::gpiote::GpiotePin for peripherals::$type { | 730 | impl crate::gpiote::GpiotePin for peripherals::$type { |
| 733 | type Instance = peripherals::$inst; | 731 | type Instance = peripherals::$inst; |
| 734 | } | 732 | } |
