diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-03-05 20:50:45 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-03-06 00:17:51 +0100 |
| commit | f8f1d3bcf09045616f5b63a08a9623cd14acd045 (patch) | |
| tree | 4510489b071c37638f3f8805d0b3d4b5543d2696 /embassy-nrf/src/chips | |
| parent | 34563b74aa48c53622344541153266b0227fc9bf (diff) | |
nrf/pdm: make available on all chips, use Instance trait, switch to new interrupt binding.
Diffstat (limited to 'embassy-nrf/src/chips')
| -rw-r--r-- | embassy-nrf/src/chips/nrf52810.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/chips/nrf52811.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/chips/nrf52832.rs | 5 | ||||
| -rw-r--r-- | embassy-nrf/src/chips/nrf52833.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/chips/nrf52840.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/chips/nrf5340_app.rs | 7 | ||||
| -rw-r--r-- | embassy-nrf/src/chips/nrf9160.rs | 2 |
7 files changed, 21 insertions, 1 deletions
diff --git a/embassy-nrf/src/chips/nrf52810.rs b/embassy-nrf/src/chips/nrf52810.rs index 6b5c134b8..c6ccb6a0e 100644 --- a/embassy-nrf/src/chips/nrf52810.rs +++ b/embassy-nrf/src/chips/nrf52810.rs | |||
| @@ -148,6 +148,8 @@ impl_twis!(TWI0, TWIS0, TWIM0_TWIS0_TWI0); | |||
| 148 | 148 | ||
| 149 | impl_pwm!(PWM0, PWM0, PWM0); | 149 | impl_pwm!(PWM0, PWM0, PWM0); |
| 150 | 150 | ||
| 151 | impl_pdm!(PDM, PDM, PDM); | ||
| 152 | |||
| 151 | impl_timer!(TIMER0, TIMER0, TIMER0); | 153 | impl_timer!(TIMER0, TIMER0, TIMER0); |
| 152 | impl_timer!(TIMER1, TIMER1, TIMER1); | 154 | impl_timer!(TIMER1, TIMER1, TIMER1); |
| 153 | impl_timer!(TIMER2, TIMER2, TIMER2); | 155 | impl_timer!(TIMER2, TIMER2, TIMER2); |
diff --git a/embassy-nrf/src/chips/nrf52811.rs b/embassy-nrf/src/chips/nrf52811.rs index c5de9a447..7d1bce1c0 100644 --- a/embassy-nrf/src/chips/nrf52811.rs +++ b/embassy-nrf/src/chips/nrf52811.rs | |||
| @@ -150,6 +150,8 @@ impl_twis!(TWISPI0, TWIS0, TWIM0_TWIS0_TWI0_SPIM0_SPIS0_SPI0); | |||
| 150 | 150 | ||
| 151 | impl_pwm!(PWM0, PWM0, PWM0); | 151 | impl_pwm!(PWM0, PWM0, PWM0); |
| 152 | 152 | ||
| 153 | impl_pdm!(PDM, PDM, PDM); | ||
| 154 | |||
| 153 | impl_timer!(TIMER0, TIMER0, TIMER0); | 155 | impl_timer!(TIMER0, TIMER0, TIMER0); |
| 154 | impl_timer!(TIMER1, TIMER1, TIMER1); | 156 | impl_timer!(TIMER1, TIMER1, TIMER1); |
| 155 | impl_timer!(TIMER2, TIMER2, TIMER2); | 157 | impl_timer!(TIMER2, TIMER2, TIMER2); |
diff --git a/embassy-nrf/src/chips/nrf52832.rs b/embassy-nrf/src/chips/nrf52832.rs index c2b23fc5b..ce19a18e8 100644 --- a/embassy-nrf/src/chips/nrf52832.rs +++ b/embassy-nrf/src/chips/nrf52832.rs | |||
| @@ -146,6 +146,9 @@ embassy_hal_common::peripherals! { | |||
| 146 | 146 | ||
| 147 | // I2S | 147 | // I2S |
| 148 | I2S, | 148 | I2S, |
| 149 | |||
| 150 | // PDM | ||
| 151 | PDM, | ||
| 149 | } | 152 | } |
| 150 | 153 | ||
| 151 | impl_uarte!(UARTE0, UARTE0, UARTE0_UART0); | 154 | impl_uarte!(UARTE0, UARTE0, UARTE0_UART0); |
| @@ -168,6 +171,8 @@ impl_pwm!(PWM0, PWM0, PWM0); | |||
| 168 | impl_pwm!(PWM1, PWM1, PWM1); | 171 | impl_pwm!(PWM1, PWM1, PWM1); |
| 169 | impl_pwm!(PWM2, PWM2, PWM2); | 172 | impl_pwm!(PWM2, PWM2, PWM2); |
| 170 | 173 | ||
| 174 | impl_pdm!(PDM, PDM, PDM); | ||
| 175 | |||
| 171 | impl_timer!(TIMER0, TIMER0, TIMER0); | 176 | impl_timer!(TIMER0, TIMER0, TIMER0); |
| 172 | impl_timer!(TIMER1, TIMER1, TIMER1); | 177 | impl_timer!(TIMER1, TIMER1, TIMER1); |
| 173 | impl_timer!(TIMER2, TIMER2, TIMER2); | 178 | impl_timer!(TIMER2, TIMER2, TIMER2); |
diff --git a/embassy-nrf/src/chips/nrf52833.rs b/embassy-nrf/src/chips/nrf52833.rs index 95f71ade7..08b82021d 100644 --- a/embassy-nrf/src/chips/nrf52833.rs +++ b/embassy-nrf/src/chips/nrf52833.rs | |||
| @@ -197,6 +197,8 @@ impl_pwm!(PWM1, PWM1, PWM1); | |||
| 197 | impl_pwm!(PWM2, PWM2, PWM2); | 197 | impl_pwm!(PWM2, PWM2, PWM2); |
| 198 | impl_pwm!(PWM3, PWM3, PWM3); | 198 | impl_pwm!(PWM3, PWM3, PWM3); |
| 199 | 199 | ||
| 200 | impl_pdm!(PDM, PDM, PDM); | ||
| 201 | |||
| 200 | impl_timer!(TIMER0, TIMER0, TIMER0); | 202 | impl_timer!(TIMER0, TIMER0, TIMER0); |
| 201 | impl_timer!(TIMER1, TIMER1, TIMER1); | 203 | impl_timer!(TIMER1, TIMER1, TIMER1); |
| 202 | impl_timer!(TIMER2, TIMER2, TIMER2); | 204 | impl_timer!(TIMER2, TIMER2, TIMER2); |
diff --git a/embassy-nrf/src/chips/nrf52840.rs b/embassy-nrf/src/chips/nrf52840.rs index 5e7479e88..4e8b6d9ee 100644 --- a/embassy-nrf/src/chips/nrf52840.rs +++ b/embassy-nrf/src/chips/nrf52840.rs | |||
| @@ -208,6 +208,8 @@ impl_timer!(TIMER4, TIMER4, TIMER4, extended); | |||
| 208 | 208 | ||
| 209 | impl_qspi!(QSPI, QSPI, QSPI); | 209 | impl_qspi!(QSPI, QSPI, QSPI); |
| 210 | 210 | ||
| 211 | impl_pdm!(PDM, PDM, PDM); | ||
| 212 | |||
| 211 | impl_pin!(P0_00, 0, 0); | 213 | impl_pin!(P0_00, 0, 0); |
| 212 | impl_pin!(P0_01, 0, 1); | 214 | impl_pin!(P0_01, 0, 1); |
| 213 | impl_pin!(P0_02, 0, 2); | 215 | impl_pin!(P0_02, 0, 2); |
diff --git a/embassy-nrf/src/chips/nrf5340_app.rs b/embassy-nrf/src/chips/nrf5340_app.rs index 9c7b738e6..050612b1c 100644 --- a/embassy-nrf/src/chips/nrf5340_app.rs +++ b/embassy-nrf/src/chips/nrf5340_app.rs | |||
| @@ -34,7 +34,7 @@ pub mod pac { | |||
| 34 | nvmc_ns as nvmc, | 34 | nvmc_ns as nvmc, |
| 35 | oscillators_ns as oscillators, | 35 | oscillators_ns as oscillators, |
| 36 | p0_ns as p0, | 36 | p0_ns as p0, |
| 37 | pdm0_ns as pdm0, | 37 | pdm0_ns as pdm, |
| 38 | power_ns as power, | 38 | power_ns as power, |
| 39 | pwm0_ns as pwm0, | 39 | pwm0_ns as pwm0, |
| 40 | qdec0_ns as qdec0, | 40 | qdec0_ns as qdec0, |
| @@ -253,6 +253,9 @@ embassy_hal_common::peripherals! { | |||
| 253 | // QSPI | 253 | // QSPI |
| 254 | QSPI, | 254 | QSPI, |
| 255 | 255 | ||
| 256 | // PDM | ||
| 257 | PDM0, | ||
| 258 | |||
| 256 | // GPIOTE | 259 | // GPIOTE |
| 257 | GPIOTE_CH0, | 260 | GPIOTE_CH0, |
| 258 | GPIOTE_CH1, | 261 | GPIOTE_CH1, |
| @@ -398,6 +401,8 @@ impl_timer!(TIMER2, TIMER2, TIMER2); | |||
| 398 | 401 | ||
| 399 | impl_qspi!(QSPI, QSPI, QSPI); | 402 | impl_qspi!(QSPI, QSPI, QSPI); |
| 400 | 403 | ||
| 404 | impl_pdm!(PDM0, PDM0, PDM0); | ||
| 405 | |||
| 401 | impl_pin!(P0_00, 0, 0); | 406 | impl_pin!(P0_00, 0, 0); |
| 402 | impl_pin!(P0_01, 0, 1); | 407 | impl_pin!(P0_01, 0, 1); |
| 403 | #[cfg(feature = "nfc-pins-as-gpio")] | 408 | #[cfg(feature = "nfc-pins-as-gpio")] |
diff --git a/embassy-nrf/src/chips/nrf9160.rs b/embassy-nrf/src/chips/nrf9160.rs index 385bd133d..d2b45114f 100644 --- a/embassy-nrf/src/chips/nrf9160.rs +++ b/embassy-nrf/src/chips/nrf9160.rs | |||
| @@ -301,6 +301,8 @@ impl_pwm!(PWM1, PWM1, PWM1); | |||
| 301 | impl_pwm!(PWM2, PWM2, PWM2); | 301 | impl_pwm!(PWM2, PWM2, PWM2); |
| 302 | impl_pwm!(PWM3, PWM3, PWM3); | 302 | impl_pwm!(PWM3, PWM3, PWM3); |
| 303 | 303 | ||
| 304 | impl_pdm!(PDM, PDM, PDM); | ||
| 305 | |||
| 304 | impl_timer!(TIMER0, TIMER0, TIMER0); | 306 | impl_timer!(TIMER0, TIMER0, TIMER0); |
| 305 | impl_timer!(TIMER1, TIMER1, TIMER1); | 307 | impl_timer!(TIMER1, TIMER1, TIMER1); |
| 306 | impl_timer!(TIMER2, TIMER2, TIMER2); | 308 | impl_timer!(TIMER2, TIMER2, TIMER2); |
