diff options
Diffstat (limited to 'embassy-nrf/src')
| -rw-r--r-- | embassy-nrf/src/chips/nrf54l15_app.rs | 9 | ||||
| -rw-r--r-- | embassy-nrf/src/lib.rs | 1 | ||||
| -rw-r--r-- | embassy-nrf/src/wdt.rs | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/embassy-nrf/src/chips/nrf54l15_app.rs b/embassy-nrf/src/chips/nrf54l15_app.rs index b133eb565..f8d1befd7 100644 --- a/embassy-nrf/src/chips/nrf54l15_app.rs +++ b/embassy-nrf/src/chips/nrf54l15_app.rs | |||
| @@ -204,6 +204,11 @@ pub const EASY_DMA_SIZE: usize = (1 << 16) - 1; | |||
| 204 | //pub const FLASH_SIZE: usize = 1024 * 1024; | 204 | //pub const FLASH_SIZE: usize = 1024 * 1024; |
| 205 | 205 | ||
| 206 | embassy_hal_internal::peripherals! { | 206 | embassy_hal_internal::peripherals! { |
| 207 | // WDT | ||
| 208 | WDT0, | ||
| 209 | #[cfg(feature = "_s")] | ||
| 210 | WDT1, | ||
| 211 | |||
| 207 | // GPIO port 0 | 212 | // GPIO port 0 |
| 208 | P0_00, | 213 | P0_00, |
| 209 | P0_01, | 214 | P0_01, |
| @@ -285,6 +290,10 @@ impl_pin!(P2_08, 2, 8); | |||
| 285 | impl_pin!(P2_09, 2, 9); | 290 | impl_pin!(P2_09, 2, 9); |
| 286 | impl_pin!(P2_10, 2, 10); | 291 | impl_pin!(P2_10, 2, 10); |
| 287 | 292 | ||
| 293 | impl_wdt!(WDT0, WDT31, WDT31, 0); | ||
| 294 | #[cfg(feature = "_s")] | ||
| 295 | impl_wdt!(WDT1, WDT30, WDT30, 1); | ||
| 296 | |||
| 288 | embassy_hal_internal::interrupt_mod!( | 297 | embassy_hal_internal::interrupt_mod!( |
| 289 | SWI00, | 298 | SWI00, |
| 290 | SWI01, | 299 | SWI01, |
diff --git a/embassy-nrf/src/lib.rs b/embassy-nrf/src/lib.rs index ba8206d13..3d1f2d4c0 100644 --- a/embassy-nrf/src/lib.rs +++ b/embassy-nrf/src/lib.rs | |||
| @@ -170,7 +170,6 @@ pub mod uarte; | |||
| 170 | feature = "nrf52840" | 170 | feature = "nrf52840" |
| 171 | ))] | 171 | ))] |
| 172 | pub mod usb; | 172 | pub mod usb; |
| 173 | #[cfg(not(feature = "_nrf54l"))] // TODO | ||
| 174 | pub mod wdt; | 173 | pub mod wdt; |
| 175 | 174 | ||
| 176 | // This mod MUST go last, so that it sees all the `impl_foo!` macros | 175 | // This mod MUST go last, so that it sees all the `impl_foo!` macros |
diff --git a/embassy-nrf/src/wdt.rs b/embassy-nrf/src/wdt.rs index 308071726..7ab9adc29 100644 --- a/embassy-nrf/src/wdt.rs +++ b/embassy-nrf/src/wdt.rs | |||
| @@ -37,9 +37,9 @@ impl Config { | |||
| 37 | pub fn try_new<T: Instance>(_wdt: &Peri<'_, T>) -> Option<Self> { | 37 | pub fn try_new<T: Instance>(_wdt: &Peri<'_, T>) -> Option<Self> { |
| 38 | let r = T::REGS; | 38 | let r = T::REGS; |
| 39 | 39 | ||
| 40 | #[cfg(not(any(feature = "_nrf91", feature = "_nrf5340")))] | 40 | #[cfg(not(any(feature = "_nrf91", feature = "_nrf5340", feature = "_nrf54l")))] |
| 41 | let runstatus = r.runstatus().read().runstatus(); | 41 | let runstatus = r.runstatus().read().runstatus(); |
| 42 | #[cfg(any(feature = "_nrf91", feature = "_nrf5340"))] | 42 | #[cfg(any(feature = "_nrf91", feature = "_nrf5340", feature = "_nrf54l"))] |
| 43 | let runstatus = r.runstatus().read().runstatuswdt(); | 43 | let runstatus = r.runstatus().read().runstatuswdt(); |
| 44 | 44 | ||
| 45 | if runstatus { | 45 | if runstatus { |
| @@ -90,9 +90,9 @@ impl<T: Instance> Watchdog<T> { | |||
| 90 | let crv = config.timeout_ticks.max(MIN_TICKS); | 90 | let crv = config.timeout_ticks.max(MIN_TICKS); |
| 91 | let rren = crate::pac::wdt::regs::Rren((1u32 << N) - 1); | 91 | let rren = crate::pac::wdt::regs::Rren((1u32 << N) - 1); |
| 92 | 92 | ||
| 93 | #[cfg(not(any(feature = "_nrf91", feature = "_nrf5340")))] | 93 | #[cfg(not(any(feature = "_nrf91", feature = "_nrf5340", feature = "_nrf54l")))] |
| 94 | let runstatus = r.runstatus().read().runstatus(); | 94 | let runstatus = r.runstatus().read().runstatus(); |
| 95 | #[cfg(any(feature = "_nrf91", feature = "_nrf5340"))] | 95 | #[cfg(any(feature = "_nrf91", feature = "_nrf5340", feature = "_nrf54l"))] |
| 96 | let runstatus = r.runstatus().read().runstatuswdt(); | 96 | let runstatus = r.runstatus().read().runstatuswdt(); |
| 97 | 97 | ||
| 98 | if runstatus { | 98 | if runstatus { |
