LailaTheElf/embassy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stm32: adc v3: fix for newest pac

Browse Source
This commit is contained in:
Andres Vahter 2024-07-02 17:15:22 +03:00
parent c120efad5b
commit a4e62314af
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
embassy-stm32/src/adc/v3.rs
View File

@ -1,11 +1,12 @@
use cfg_if::cfg_if; use cfg_if::cfg_if;
use embassy_hal_internal::into_ref; use embassy_hal_internal::into_ref;
use pac::adc::vals::Dmacfg;
use super::{ use super::{
blocking_delay_us, Adc, AdcChannel, AnyAdcChannel, Instance, Resolution, RxDma, SampleTime, SealedAdcChannel, blocking_delay_us, Adc, AdcChannel, AnyAdcChannel, Instance, Resolution, RxDma, SampleTime, SealedAdcChannel,
}; };
use crate::dma::Transfer; use crate::dma::Transfer;
use crate::{rcc, Peripheral}; use crate::{pac, rcc, Peripheral};
/// Default VREF voltage used for sample conversion to millivolts. /// Default VREF voltage used for sample conversion to millivolts.
pub const VREF_DEFAULT_MV: u32 = 3300; pub const VREF_DEFAULT_MV: u32 = 3300;
@ -341,16 +342,14 @@ impl<'d, T: Instance> Adc<'d, T> {
T::regs().cfgr().modify(|reg| { T::regs().cfgr().modify(|reg| {
reg.set_discen(false); reg.set_discen(false);
reg.set_cont(true); reg.set_cont(true);
// Oneshot mode reg.set_dmacfg(Dmacfg::ONESHOT);
reg.set_dmacfg(false);
reg.set_dmaen(true); reg.set_dmaen(true);
}); });
#[cfg(any(adc_g0, adc_u0))] #[cfg(any(adc_g0, adc_u0))]
T::regs().cfgr1().modify(|reg| { T::regs().cfgr1().modify(|reg| {
reg.set_discen(false); reg.set_discen(false);
reg.set_cont(true); reg.set_cont(true);
// Oneshot mode reg.set_dmacfg(Dmacfg::ONESHOT);
reg.set_dmacfg(false);
reg.set_dmaen(true); reg.set_dmaen(true);
}); });

3
embassy-stm32/src/adc/v4.rs
View File

@ -1,6 +1,5 @@
#[allow(unused)] #[allow(unused)]
use pac::adc::vals::{Adcaldif, Boost, Difsel, Exten, Pcsel}; use pac::adc::vals::{Adcaldif, Adstp, Boost, Difsel, Dmngt, Exten, Pcsel};
use pac::adc::vals::{Adstp, Dmngt};
use pac::adccommon::vals::Presc; use pac::adccommon::vals::Presc;
use super::{ use super::{