diff options
| author | xoviat <[email protected]> | 2025-11-10 09:56:42 -0600 |
|---|---|---|
| committer | xoviat <[email protected]> | 2025-11-10 09:56:42 -0600 |
| commit | 12b59dc610fb659a4d51ccc364865a7e154379d6 (patch) | |
| tree | 4d91375fb1ba72c65a5a50ab213181a03828c280 /examples/stm32f4 | |
| parent | 1da05747c416c989a128aabbbde4b46df7bba9b9 (diff) | |
adc: remove sample_time from struct
Diffstat (limited to 'examples/stm32f4')
| -rw-r--r-- | examples/stm32f4/src/bin/adc.rs | 10 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/adc_dma.rs | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/examples/stm32f4/src/bin/adc.rs b/examples/stm32f4/src/bin/adc.rs index 423d29225..5628cb827 100644 --- a/examples/stm32f4/src/bin/adc.rs +++ b/examples/stm32f4/src/bin/adc.rs | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | use cortex_m::prelude::_embedded_hal_blocking_delay_DelayUs; | 4 | use cortex_m::prelude::_embedded_hal_blocking_delay_DelayUs; |
| 5 | use defmt::*; | 5 | use defmt::*; |
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_stm32::adc::{Adc, Temperature, VrefInt}; | 7 | use embassy_stm32::adc::{Adc, SampleTime, Temperature, VrefInt}; |
| 8 | use embassy_time::{Delay, Timer}; | 8 | use embassy_time::{Delay, Timer}; |
| 9 | use {defmt_rtt as _, panic_probe as _}; | 9 | use {defmt_rtt as _, panic_probe as _}; |
| 10 | 10 | ||
| @@ -23,7 +23,7 @@ async fn main(_spawner: Spawner) { | |||
| 23 | // Startup delay can be combined to the maximum of either | 23 | // Startup delay can be combined to the maximum of either |
| 24 | delay.delay_us(Temperature::start_time_us().max(VrefInt::start_time_us())); | 24 | delay.delay_us(Temperature::start_time_us().max(VrefInt::start_time_us())); |
| 25 | 25 | ||
| 26 | let vrefint_sample = adc.blocking_read(&mut vrefint); | 26 | let vrefint_sample = adc.blocking_read(&mut vrefint, SampleTime::CYCLES112); |
| 27 | 27 | ||
| 28 | let convert_to_millivolts = |sample| { | 28 | let convert_to_millivolts = |sample| { |
| 29 | // From http://www.st.com/resource/en/datasheet/DM00071990.pdf | 29 | // From http://www.st.com/resource/en/datasheet/DM00071990.pdf |
| @@ -50,16 +50,16 @@ async fn main(_spawner: Spawner) { | |||
| 50 | 50 | ||
| 51 | loop { | 51 | loop { |
| 52 | // Read pin | 52 | // Read pin |
| 53 | let v = adc.blocking_read(&mut pin); | 53 | let v = adc.blocking_read(&mut pin, SampleTime::CYCLES112); |
| 54 | info!("PC1: {} ({} mV)", v, convert_to_millivolts(v)); | 54 | info!("PC1: {} ({} mV)", v, convert_to_millivolts(v)); |
| 55 | 55 | ||
| 56 | // Read internal temperature | 56 | // Read internal temperature |
| 57 | let v = adc.blocking_read(&mut temp); | 57 | let v = adc.blocking_read(&mut temp, SampleTime::CYCLES112); |
| 58 | let celcius = convert_to_celcius(v); | 58 | let celcius = convert_to_celcius(v); |
| 59 | info!("Internal temp: {} ({} C)", v, celcius); | 59 | info!("Internal temp: {} ({} C)", v, celcius); |
| 60 | 60 | ||
| 61 | // Read internal voltage reference | 61 | // Read internal voltage reference |
| 62 | let v = adc.blocking_read(&mut vrefint); | 62 | let v = adc.blocking_read(&mut vrefint, SampleTime::CYCLES112); |
| 63 | info!("VrefInt: {}", v); | 63 | info!("VrefInt: {}", v); |
| 64 | 64 | ||
| 65 | Timer::after_millis(100).await; | 65 | Timer::after_millis(100).await; |
diff --git a/examples/stm32f4/src/bin/adc_dma.rs b/examples/stm32f4/src/bin/adc_dma.rs index f8da91336..01b881c79 100644 --- a/examples/stm32f4/src/bin/adc_dma.rs +++ b/examples/stm32f4/src/bin/adc_dma.rs | |||
| @@ -27,8 +27,8 @@ async fn adc_task(p: Peripherals) { | |||
| 27 | p.DMA2_CH0, | 27 | p.DMA2_CH0, |
| 28 | adc_data, | 28 | adc_data, |
| 29 | [ | 29 | [ |
| 30 | (&mut p.PA0.degrade_adc(), SampleTime::CYCLES112), | 30 | (p.PA0.degrade_adc(), SampleTime::CYCLES112), |
| 31 | (&mut p.PA2.degrade_adc(), SampleTime::CYCLES112), | 31 | (p.PA2.degrade_adc(), SampleTime::CYCLES112), |
| 32 | ] | 32 | ] |
| 33 | .into_iter(), | 33 | .into_iter(), |
| 34 | ); | 34 | ); |
| @@ -36,8 +36,8 @@ async fn adc_task(p: Peripherals) { | |||
| 36 | p.DMA2_CH2, | 36 | p.DMA2_CH2, |
| 37 | adc_data2, | 37 | adc_data2, |
| 38 | [ | 38 | [ |
| 39 | (&mut p.PA1.degrade_adc(), SampleTime::CYCLES112), | 39 | (p.PA1.degrade_adc(), SampleTime::CYCLES112), |
| 40 | (&mut p.PA3.degrade_adc(), SampleTime::CYCLES112), | 40 | (p.PA3.degrade_adc(), SampleTime::CYCLES112), |
| 41 | ] | 41 | ] |
| 42 | .into_iter(), | 42 | .into_iter(), |
| 43 | ); | 43 | ); |
