diff options
| author | Andres Vahter <[email protected]> | 2024-07-02 17:15:22 +0300 |
|---|---|---|
| committer | Andres Vahter <[email protected]> | 2024-07-02 17:15:22 +0300 |
| commit | a4e62314af50d58eb42689e095ffc4a117aad35d (patch) | |
| tree | f5b8ae46dd06d9a56c98a4bc7b746555abd09c11 /embassy-stm32 | |
| parent | c120efad5bbd7f95615e913100874d27c34cb389 (diff) | |
stm32: adc v3: fix for newest pac
Diffstat (limited to 'embassy-stm32')
| -rw-r--r-- | embassy-stm32/src/adc/v3.rs | 9 | ||||
| -rw-r--r-- | embassy-stm32/src/adc/v4.rs | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/embassy-stm32/src/adc/v3.rs b/embassy-stm32/src/adc/v3.rs index afdfc4e4c..6703268ee 100644 --- a/embassy-stm32/src/adc/v3.rs +++ b/embassy-stm32/src/adc/v3.rs | |||
| @@ -1,11 +1,12 @@ | |||
| 1 | use cfg_if::cfg_if; | 1 | use cfg_if::cfg_if; |
| 2 | use embassy_hal_internal::into_ref; | 2 | use embassy_hal_internal::into_ref; |
| 3 | use pac::adc::vals::Dmacfg; | ||
| 3 | 4 | ||
| 4 | use super::{ | 5 | use super::{ |
| 5 | blocking_delay_us, Adc, AdcChannel, AnyAdcChannel, Instance, Resolution, RxDma, SampleTime, SealedAdcChannel, | 6 | blocking_delay_us, Adc, AdcChannel, AnyAdcChannel, Instance, Resolution, RxDma, SampleTime, SealedAdcChannel, |
| 6 | }; | 7 | }; |
| 7 | use crate::dma::Transfer; | 8 | use crate::dma::Transfer; |
| 8 | use crate::{rcc, Peripheral}; | 9 | use crate::{pac, rcc, Peripheral}; |
| 9 | 10 | ||
| 10 | /// Default VREF voltage used for sample conversion to millivolts. | 11 | /// Default VREF voltage used for sample conversion to millivolts. |
| 11 | pub const VREF_DEFAULT_MV: u32 = 3300; | 12 | pub const VREF_DEFAULT_MV: u32 = 3300; |
| @@ -341,16 +342,14 @@ impl<'d, T: Instance> Adc<'d, T> { | |||
| 341 | T::regs().cfgr().modify(|reg| { | 342 | T::regs().cfgr().modify(|reg| { |
| 342 | reg.set_discen(false); | 343 | reg.set_discen(false); |
| 343 | reg.set_cont(true); | 344 | reg.set_cont(true); |
| 344 | // Oneshot mode | 345 | reg.set_dmacfg(Dmacfg::ONESHOT); |
| 345 | reg.set_dmacfg(false); | ||
| 346 | reg.set_dmaen(true); | 346 | reg.set_dmaen(true); |
| 347 | }); | 347 | }); |
| 348 | #[cfg(any(adc_g0, adc_u0))] | 348 | #[cfg(any(adc_g0, adc_u0))] |
| 349 | T::regs().cfgr1().modify(|reg| { | 349 | T::regs().cfgr1().modify(|reg| { |
| 350 | reg.set_discen(false); | 350 | reg.set_discen(false); |
| 351 | reg.set_cont(true); | 351 | reg.set_cont(true); |
| 352 | // Oneshot mode | 352 | reg.set_dmacfg(Dmacfg::ONESHOT); |
| 353 | reg.set_dmacfg(false); | ||
| 354 | reg.set_dmaen(true); | 353 | reg.set_dmaen(true); |
| 355 | }); | 354 | }); |
| 356 | 355 | ||
diff --git a/embassy-stm32/src/adc/v4.rs b/embassy-stm32/src/adc/v4.rs index 4261b9b14..344bf89af 100644 --- a/embassy-stm32/src/adc/v4.rs +++ b/embassy-stm32/src/adc/v4.rs | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #[allow(unused)] | 1 | #[allow(unused)] |
| 2 | use pac::adc::vals::{Adcaldif, Boost, Difsel, Exten, Pcsel}; | 2 | use pac::adc::vals::{Adcaldif, Adstp, Boost, Difsel, Dmngt, Exten, Pcsel}; |
| 3 | use pac::adc::vals::{Adstp, Dmngt}; | ||
| 4 | use pac::adccommon::vals::Presc; | 3 | use pac::adccommon::vals::Presc; |
| 5 | 4 | ||
| 6 | use super::{ | 5 | use super::{ |
