diff options
| -rw-r--r-- | embassy-nrf/src/chips/nrf54l15_app.rs | 24 | ||||
| -rw-r--r-- | embassy-nrf/src/gpiote.rs | 26 | ||||
| -rw-r--r-- | examples/nrf54l15/src/bin/gpiote_channel.rs | 8 |
3 files changed, 29 insertions, 29 deletions
diff --git a/embassy-nrf/src/chips/nrf54l15_app.rs b/embassy-nrf/src/chips/nrf54l15_app.rs index 2e1ac9be8..c471d7400 100644 --- a/embassy-nrf/src/chips/nrf54l15_app.rs +++ b/embassy-nrf/src/chips/nrf54l15_app.rs | |||
| @@ -340,18 +340,18 @@ embassy_hal_internal::peripherals! { | |||
| 340 | GPIOTE30, | 340 | GPIOTE30, |
| 341 | 341 | ||
| 342 | // GPIOTE channels | 342 | // GPIOTE channels |
| 343 | GPIOTE_CH0, | 343 | GPIOTE20_CH0, |
| 344 | GPIOTE_CH1, | 344 | GPIOTE20_CH1, |
| 345 | GPIOTE_CH2, | 345 | GPIOTE20_CH2, |
| 346 | GPIOTE_CH3, | 346 | GPIOTE20_CH3, |
| 347 | GPIOTE_CH4, | 347 | GPIOTE20_CH4, |
| 348 | GPIOTE_CH5, | 348 | GPIOTE20_CH5, |
| 349 | GPIOTE_CH6, | 349 | GPIOTE20_CH6, |
| 350 | GPIOTE_CH7, | 350 | GPIOTE20_CH7, |
| 351 | GPIOTE_CH8, | 351 | GPIOTE30_CH0, |
| 352 | GPIOTE_CH9, | 352 | GPIOTE30_CH1, |
| 353 | GPIOTE_CH10, | 353 | GPIOTE30_CH2, |
| 354 | GPIOTE_CH11, | 354 | GPIOTE30_CH3, |
| 355 | 355 | ||
| 356 | // CRACEN | 356 | // CRACEN |
| 357 | CRACEN, | 357 | CRACEN, |
diff --git a/embassy-nrf/src/gpiote.rs b/embassy-nrf/src/gpiote.rs index ed95f5d83..626ae892f 100644 --- a/embassy-nrf/src/gpiote.rs +++ b/embassy-nrf/src/gpiote.rs | |||
| @@ -737,19 +737,19 @@ cfg_if::cfg_if! { | |||
| 737 | 737 | ||
| 738 | impl_gpiote!(GPIOTE20); | 738 | impl_gpiote!(GPIOTE20); |
| 739 | impl_gpiote!(GPIOTE30); | 739 | impl_gpiote!(GPIOTE30); |
| 740 | impl_channel!(GPIOTE_CH0, GPIOTE20, 0, 0); | 740 | impl_channel!(GPIOTE20_CH0, GPIOTE20, 0, 0); |
| 741 | impl_channel!(GPIOTE_CH1, GPIOTE20, 1, 1); | 741 | impl_channel!(GPIOTE20_CH1, GPIOTE20, 1, 1); |
| 742 | impl_channel!(GPIOTE_CH2, GPIOTE20, 2, 2); | 742 | impl_channel!(GPIOTE20_CH2, GPIOTE20, 2, 2); |
| 743 | impl_channel!(GPIOTE_CH3, GPIOTE20, 3, 3); | 743 | impl_channel!(GPIOTE20_CH3, GPIOTE20, 3, 3); |
| 744 | impl_channel!(GPIOTE_CH4, GPIOTE20, 4, 4); | 744 | impl_channel!(GPIOTE20_CH4, GPIOTE20, 4, 4); |
| 745 | impl_channel!(GPIOTE_CH5, GPIOTE20, 5, 5); | 745 | impl_channel!(GPIOTE20_CH5, GPIOTE20, 5, 5); |
| 746 | impl_channel!(GPIOTE_CH6, GPIOTE20, 6, 6); | 746 | impl_channel!(GPIOTE20_CH6, GPIOTE20, 6, 6); |
| 747 | impl_channel!(GPIOTE_CH7, GPIOTE20, 7, 7); | 747 | impl_channel!(GPIOTE20_CH7, GPIOTE20, 7, 7); |
| 748 | 748 | ||
| 749 | impl_channel!(GPIOTE_CH8, GPIOTE30, 0, 8); | 749 | impl_channel!(GPIOTE30_CH0, GPIOTE30, 0, 8); |
| 750 | impl_channel!(GPIOTE_CH9, GPIOTE30, 1, 9); | 750 | impl_channel!(GPIOTE30_CH1, GPIOTE30, 1, 9); |
| 751 | impl_channel!(GPIOTE_CH10, GPIOTE30, 2, 10); | 751 | impl_channel!(GPIOTE30_CH2, GPIOTE30, 2, 10); |
| 752 | impl_channel!(GPIOTE_CH11, GPIOTE30, 3, 11); | 752 | impl_channel!(GPIOTE30_CH3, GPIOTE30, 3, 11); |
| 753 | } else if #[cfg(feature = "_nrf51")] { | 753 | } else if #[cfg(feature = "_nrf51")] { |
| 754 | impl_channel!(GPIOTE_CH0, GPIOTE, 0, 0); | 754 | impl_channel!(GPIOTE_CH0, GPIOTE, 0, 0); |
| 755 | impl_channel!(GPIOTE_CH1, GPIOTE, 1, 1); | 755 | impl_channel!(GPIOTE_CH1, GPIOTE, 1, 1); |
diff --git a/examples/nrf54l15/src/bin/gpiote_channel.rs b/examples/nrf54l15/src/bin/gpiote_channel.rs index 3fa0972a7..6333250ba 100644 --- a/examples/nrf54l15/src/bin/gpiote_channel.rs +++ b/examples/nrf54l15/src/bin/gpiote_channel.rs | |||
| @@ -12,10 +12,10 @@ async fn main(_spawner: Spawner) { | |||
| 12 | let p = embassy_nrf::init(Default::default()); | 12 | let p = embassy_nrf::init(Default::default()); |
| 13 | info!("Starting!"); | 13 | info!("Starting!"); |
| 14 | 14 | ||
| 15 | let ch1 = InputChannel::new(p.GPIOTE_CH0, p.P1_13, Pull::Up, InputChannelPolarity::HiToLo); | 15 | let ch1 = InputChannel::new(p.GPIOTE20_CH0, p.P1_13, Pull::Up, InputChannelPolarity::HiToLo); |
| 16 | let ch2 = InputChannel::new(p.GPIOTE_CH1, p.P1_09, Pull::Up, InputChannelPolarity::LoToHi); | 16 | let ch2 = InputChannel::new(p.GPIOTE20_CH1, p.P1_09, Pull::Up, InputChannelPolarity::LoToHi); |
| 17 | let ch3 = InputChannel::new(p.GPIOTE_CH2, p.P1_08, Pull::Up, InputChannelPolarity::Toggle); | 17 | let ch3 = InputChannel::new(p.GPIOTE20_CH2, p.P1_08, Pull::Up, InputChannelPolarity::Toggle); |
| 18 | let ch4 = InputChannel::new(p.GPIOTE_CH8, p.P0_04, Pull::Up, InputChannelPolarity::Toggle); | 18 | let ch4 = InputChannel::new(p.GPIOTE30_CH0, p.P0_04, Pull::Up, InputChannelPolarity::Toggle); |
| 19 | 19 | ||
| 20 | let button1 = async { | 20 | let button1 = async { |
| 21 | loop { | 21 | loop { |
