diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-03-05 21:28:13 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-03-06 00:17:51 +0100 |
| commit | c66b28e759dc42c5f802336385a66eb8a82dab9a (patch) | |
| tree | adf46357b1e7bc8f212a760f0007e8a026bac66d /embassy-nrf/src/chips | |
| parent | f8f1d3bcf09045616f5b63a08a9623cd14acd045 (diff) | |
nrf/qdec: 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/nrf52805.rs | 2 | ||||
| -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/nrf52820.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/chips/nrf52832.rs | 2 | ||||
| -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 | 9 |
8 files changed, 22 insertions, 1 deletions
diff --git a/embassy-nrf/src/chips/nrf52805.rs b/embassy-nrf/src/chips/nrf52805.rs index 3c74a2a63..185cda430 100644 --- a/embassy-nrf/src/chips/nrf52805.rs +++ b/embassy-nrf/src/chips/nrf52805.rs | |||
| @@ -140,6 +140,8 @@ impl_twim!(TWI0, TWIM0, TWIM0_TWIS0_TWI0); | |||
| 140 | 140 | ||
| 141 | impl_twis!(TWI0, TWIS0, TWIM0_TWIS0_TWI0); | 141 | impl_twis!(TWI0, TWIS0, TWIM0_TWIS0_TWI0); |
| 142 | 142 | ||
| 143 | impl_qdec!(QDEC, QDEC, QDEC); | ||
| 144 | |||
| 143 | impl_timer!(TIMER0, TIMER0, TIMER0); | 145 | impl_timer!(TIMER0, TIMER0, TIMER0); |
| 144 | impl_timer!(TIMER1, TIMER1, TIMER1); | 146 | impl_timer!(TIMER1, TIMER1, TIMER1); |
| 145 | impl_timer!(TIMER2, TIMER2, TIMER2); | 147 | impl_timer!(TIMER2, TIMER2, TIMER2); |
diff --git a/embassy-nrf/src/chips/nrf52810.rs b/embassy-nrf/src/chips/nrf52810.rs index c6ccb6a0e..1e3c054a4 100644 --- a/embassy-nrf/src/chips/nrf52810.rs +++ b/embassy-nrf/src/chips/nrf52810.rs | |||
| @@ -150,6 +150,8 @@ impl_pwm!(PWM0, PWM0, PWM0); | |||
| 150 | 150 | ||
| 151 | impl_pdm!(PDM, PDM, PDM); | 151 | impl_pdm!(PDM, PDM, PDM); |
| 152 | 152 | ||
| 153 | impl_qdec!(QDEC, QDEC, QDEC); | ||
| 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/nrf52811.rs b/embassy-nrf/src/chips/nrf52811.rs index 7d1bce1c0..3bb44171e 100644 --- a/embassy-nrf/src/chips/nrf52811.rs +++ b/embassy-nrf/src/chips/nrf52811.rs | |||
| @@ -152,6 +152,8 @@ impl_pwm!(PWM0, PWM0, PWM0); | |||
| 152 | 152 | ||
| 153 | impl_pdm!(PDM, PDM, PDM); | 153 | impl_pdm!(PDM, PDM, PDM); |
| 154 | 154 | ||
| 155 | impl_qdec!(QDEC, QDEC, QDEC); | ||
| 156 | |||
| 155 | impl_timer!(TIMER0, TIMER0, TIMER0); | 157 | impl_timer!(TIMER0, TIMER0, TIMER0); |
| 156 | impl_timer!(TIMER1, TIMER1, TIMER1); | 158 | impl_timer!(TIMER1, TIMER1, TIMER1); |
| 157 | impl_timer!(TIMER2, TIMER2, TIMER2); | 159 | impl_timer!(TIMER2, TIMER2, TIMER2); |
diff --git a/embassy-nrf/src/chips/nrf52820.rs b/embassy-nrf/src/chips/nrf52820.rs index 81b07f32c..b28778f33 100644 --- a/embassy-nrf/src/chips/nrf52820.rs +++ b/embassy-nrf/src/chips/nrf52820.rs | |||
| @@ -153,6 +153,8 @@ impl_timer!(TIMER1, TIMER1, TIMER1); | |||
| 153 | impl_timer!(TIMER2, TIMER2, TIMER2); | 153 | impl_timer!(TIMER2, TIMER2, TIMER2); |
| 154 | impl_timer!(TIMER3, TIMER3, TIMER3, extended); | 154 | impl_timer!(TIMER3, TIMER3, TIMER3, extended); |
| 155 | 155 | ||
| 156 | impl_qdec!(QDEC, QDEC, QDEC); | ||
| 157 | |||
| 156 | impl_pin!(P0_00, 0, 0); | 158 | impl_pin!(P0_00, 0, 0); |
| 157 | impl_pin!(P0_01, 0, 1); | 159 | impl_pin!(P0_01, 0, 1); |
| 158 | impl_pin!(P0_02, 0, 2); | 160 | impl_pin!(P0_02, 0, 2); |
diff --git a/embassy-nrf/src/chips/nrf52832.rs b/embassy-nrf/src/chips/nrf52832.rs index ce19a18e8..00dc9fd8f 100644 --- a/embassy-nrf/src/chips/nrf52832.rs +++ b/embassy-nrf/src/chips/nrf52832.rs | |||
| @@ -173,6 +173,8 @@ impl_pwm!(PWM2, PWM2, PWM2); | |||
| 173 | 173 | ||
| 174 | impl_pdm!(PDM, PDM, PDM); | 174 | impl_pdm!(PDM, PDM, PDM); |
| 175 | 175 | ||
| 176 | impl_qdec!(QDEC, QDEC, QDEC); | ||
| 177 | |||
| 176 | impl_timer!(TIMER0, TIMER0, TIMER0); | 178 | impl_timer!(TIMER0, TIMER0, TIMER0); |
| 177 | impl_timer!(TIMER1, TIMER1, TIMER1); | 179 | impl_timer!(TIMER1, TIMER1, TIMER1); |
| 178 | impl_timer!(TIMER2, TIMER2, TIMER2); | 180 | impl_timer!(TIMER2, TIMER2, TIMER2); |
diff --git a/embassy-nrf/src/chips/nrf52833.rs b/embassy-nrf/src/chips/nrf52833.rs index 08b82021d..345608c9d 100644 --- a/embassy-nrf/src/chips/nrf52833.rs +++ b/embassy-nrf/src/chips/nrf52833.rs | |||
| @@ -199,6 +199,8 @@ impl_pwm!(PWM3, PWM3, PWM3); | |||
| 199 | 199 | ||
| 200 | impl_pdm!(PDM, PDM, PDM); | 200 | impl_pdm!(PDM, PDM, PDM); |
| 201 | 201 | ||
| 202 | impl_qdec!(QDEC, QDEC, QDEC); | ||
| 203 | |||
| 202 | impl_timer!(TIMER0, TIMER0, TIMER0); | 204 | impl_timer!(TIMER0, TIMER0, TIMER0); |
| 203 | impl_timer!(TIMER1, TIMER1, TIMER1); | 205 | impl_timer!(TIMER1, TIMER1, TIMER1); |
| 204 | impl_timer!(TIMER2, TIMER2, TIMER2); | 206 | impl_timer!(TIMER2, TIMER2, TIMER2); |
diff --git a/embassy-nrf/src/chips/nrf52840.rs b/embassy-nrf/src/chips/nrf52840.rs index 4e8b6d9ee..630f01aa9 100644 --- a/embassy-nrf/src/chips/nrf52840.rs +++ b/embassy-nrf/src/chips/nrf52840.rs | |||
| @@ -210,6 +210,8 @@ impl_qspi!(QSPI, QSPI, QSPI); | |||
| 210 | 210 | ||
| 211 | impl_pdm!(PDM, PDM, PDM); | 211 | impl_pdm!(PDM, PDM, PDM); |
| 212 | 212 | ||
| 213 | impl_qdec!(QDEC, QDEC, QDEC); | ||
| 214 | |||
| 213 | impl_pin!(P0_00, 0, 0); | 215 | impl_pin!(P0_00, 0, 0); |
| 214 | impl_pin!(P0_01, 0, 1); | 216 | impl_pin!(P0_01, 0, 1); |
| 215 | impl_pin!(P0_02, 0, 2); | 217 | 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 050612b1c..34f96800f 100644 --- a/embassy-nrf/src/chips/nrf5340_app.rs +++ b/embassy-nrf/src/chips/nrf5340_app.rs | |||
| @@ -37,7 +37,7 @@ pub mod pac { | |||
| 37 | pdm0_ns as pdm, | 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 qdec, |
| 41 | qspi_ns as qspi, | 41 | qspi_ns as qspi, |
| 42 | regulators_ns as regulators, | 42 | regulators_ns as regulators, |
| 43 | reset_ns as reset, | 43 | reset_ns as reset, |
| @@ -256,6 +256,10 @@ embassy_hal_common::peripherals! { | |||
| 256 | // PDM | 256 | // PDM |
| 257 | PDM0, | 257 | PDM0, |
| 258 | 258 | ||
| 259 | // QDEC | ||
| 260 | QDEC0, | ||
| 261 | QDEC1, | ||
| 262 | |||
| 259 | // GPIOTE | 263 | // GPIOTE |
| 260 | GPIOTE_CH0, | 264 | GPIOTE_CH0, |
| 261 | GPIOTE_CH1, | 265 | GPIOTE_CH1, |
| @@ -403,6 +407,9 @@ impl_qspi!(QSPI, QSPI, QSPI); | |||
| 403 | 407 | ||
| 404 | impl_pdm!(PDM0, PDM0, PDM0); | 408 | impl_pdm!(PDM0, PDM0, PDM0); |
| 405 | 409 | ||
| 410 | impl_qdec!(QDEC0, QDEC0, QDEC0); | ||
| 411 | impl_qdec!(QDEC1, QDEC1, QDEC1); | ||
| 412 | |||
| 406 | impl_pin!(P0_00, 0, 0); | 413 | impl_pin!(P0_00, 0, 0); |
| 407 | impl_pin!(P0_01, 0, 1); | 414 | impl_pin!(P0_01, 0, 1); |
| 408 | #[cfg(feature = "nfc-pins-as-gpio")] | 415 | #[cfg(feature = "nfc-pins-as-gpio")] |
