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

stm32/adc: simplify delay handling

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2021-07-05 03:09:42 +02:00
parent 7ebd4e3aa9
commit ecc151d4e2
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
use crate::adc::{AdcPin, Instance}; use crate::adc::{AdcPin, Instance};
use core::marker::PhantomData; use core::marker::PhantomData;
use cortex_m::delay::Delay;
use embassy::util::Unborrow; use embassy::util::Unborrow;
use embassy_extras::unborrow; use embassy_extras::unborrow;
use embedded_hal::blocking::delay::DelayUs; use embedded_hal::blocking::delay::DelayUs;
@ -123,7 +122,7 @@ pub struct Adc<'d, T: Instance> {
} }
impl<'d, T: Instance> Adc<'d, T> { impl<'d, T: Instance> Adc<'d, T> {
pub fn new(_peri: impl Unborrow<Target = T> + 'd, mut delay: Delay) -> (Self, Delay) { pub fn new(_peri: impl Unborrow<Target = T> + 'd, delay: &mut impl DelayUs<u32>) -> Self {
unborrow!(_peri); unborrow!(_peri);
unsafe { unsafe {
T::regs().cr().modify(|reg| { T::regs().cr().modify(|reg| {
@ -142,18 +141,15 @@ impl<'d, T: Instance> Adc<'d, T> {
delay.delay_us(1); delay.delay_us(1);
(
Self { Self {
sample_time: Default::default(), sample_time: Default::default(),
resolution: Resolution::default(), resolution: Resolution::default(),
calibrated_vdda: VDDA_CALIB_MV, calibrated_vdda: VDDA_CALIB_MV,
phantom: PhantomData, phantom: PhantomData,
}, }
delay,
)
} }
pub fn enable_vref(&self, mut delay: Delay) -> (Vref, Delay) { pub fn enable_vref(&self, delay: &mut impl DelayUs<u32>) -> Vref {
unsafe { unsafe {
T::common_regs().ccr().modify(|reg| { T::common_regs().ccr().modify(|reg| {
reg.set_vrefen(true); reg.set_vrefen(true);
@ -166,7 +162,7 @@ impl<'d, T: Instance> Adc<'d, T> {
//cortex_m::asm::delay(20_000_000); //cortex_m::asm::delay(20_000_000);
delay.delay_us(15); delay.delay_us(15);
(Vref {}, delay) Vref {}
} }
pub fn enable_temperature(&self) -> Temperature { pub fn enable_temperature(&self) -> Temperature {

9
examples/stm32l4/src/bin/adc.rs
View File

@ -16,8 +16,8 @@ use cortex_m_rt::entry;
use cortex_m::delay::Delay; use cortex_m::delay::Delay;
use embassy_stm32::adc::{Adc, Resolution}; use embassy_stm32::adc::{Adc, Resolution};
use stm32l4::stm32l4x5 as pac; use stm32l4::stm32l4x5 as pac;
use stm32l4xx_hal::rcc::PllSource;
use stm32l4xx_hal::prelude::*; use stm32l4xx_hal::prelude::*;
use stm32l4xx_hal::rcc::PllSource;
#[entry] #[entry]
fn main() -> ! { fn main() -> ! {
@ -29,12 +29,11 @@ fn main() -> ! {
let mut rcc = pp.RCC.constrain(); let mut rcc = pp.RCC.constrain();
let mut pwr = pp.PWR.constrain(&mut rcc.apb1r1); let mut pwr = pp.PWR.constrain(&mut rcc.apb1r1);
let delay = Delay::new(cp.SYST, 80_000_000); let mut delay = Delay::new(cp.SYST, 80_000_000);
// TRY the other clock configuration // TRY the other clock configuration
// let clocks = rcc.cfgr.freeze(&mut flash.acr); // let clocks = rcc.cfgr.freeze(&mut flash.acr);
rcc rcc.cfgr
.cfgr
.sysclk(80.mhz()) .sysclk(80.mhz())
.pclk1(80.mhz()) .pclk1(80.mhz())
.pclk2(80.mhz()) .pclk2(80.mhz())
@ -69,7 +68,7 @@ fn main() -> ! {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
let (mut adc, _) = Adc::new(p.ADC1, delay); let mut adc = Adc::new(p.ADC1, &mut delay);
//adc.enable_vref(); //adc.enable_vref();
adc.set_resolution(Resolution::EightBit); adc.set_resolution(Resolution::EightBit);
let mut channel = p.PC0; let mut channel = p.PC0;