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/stm32l4 | |
| parent | 1da05747c416c989a128aabbbde4b46df7bba9b9 (diff) | |
adc: remove sample_time from struct
Diffstat (limited to 'examples/stm32l4')
| -rw-r--r-- | examples/stm32l4/src/bin/adc.rs | 4 | ||||
| -rw-r--r-- | examples/stm32l4/src/bin/adc_dma.rs | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/examples/stm32l4/src/bin/adc.rs b/examples/stm32l4/src/bin/adc.rs index 40e907940..835bf5411 100644 --- a/examples/stm32l4/src/bin/adc.rs +++ b/examples/stm32l4/src/bin/adc.rs | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | use defmt::*; | 4 | use defmt::*; |
| 5 | use embassy_stm32::Config; | 5 | use embassy_stm32::Config; |
| 6 | use embassy_stm32::adc::{Adc, Resolution}; | 6 | use embassy_stm32::adc::{Adc, Resolution, SampleTime}; |
| 7 | use {defmt_rtt as _, panic_probe as _}; | 7 | use {defmt_rtt as _, panic_probe as _}; |
| 8 | 8 | ||
| 9 | #[cortex_m_rt::entry] | 9 | #[cortex_m_rt::entry] |
| @@ -23,7 +23,7 @@ fn main() -> ! { | |||
| 23 | let mut channel = p.PC0; | 23 | let mut channel = p.PC0; |
| 24 | 24 | ||
| 25 | loop { | 25 | loop { |
| 26 | let v = adc.blocking_read(&mut channel); | 26 | let v = adc.blocking_read(&mut channel, SampleTime::from_bits(0)); |
| 27 | info!("--> {}", v); | 27 | info!("--> {}", v); |
| 28 | } | 28 | } |
| 29 | } | 29 | } |
diff --git a/examples/stm32l4/src/bin/adc_dma.rs b/examples/stm32l4/src/bin/adc_dma.rs index 7a9200edd..ab1e9d2e9 100644 --- a/examples/stm32l4/src/bin/adc_dma.rs +++ b/examples/stm32l4/src/bin/adc_dma.rs | |||
| @@ -21,18 +21,14 @@ async fn main(_spawner: Spawner) { | |||
| 21 | let p = embassy_stm32::init(config); | 21 | let p = embassy_stm32::init(config); |
| 22 | 22 | ||
| 23 | let mut adc = Adc::new(p.ADC1); | 23 | let mut adc = Adc::new(p.ADC1); |
| 24 | let mut adc_pin0 = p.PA0.degrade_adc(); | 24 | let adc_pin0 = p.PA0.degrade_adc(); |
| 25 | let mut adc_pin1 = p.PA1.degrade_adc(); | 25 | let adc_pin1 = p.PA1.degrade_adc(); |
| 26 | let mut adc_dma_buf = [0u16; DMA_BUF_LEN]; | 26 | let mut adc_dma_buf = [0u16; DMA_BUF_LEN]; |
| 27 | let mut measurements = [0u16; DMA_BUF_LEN / 2]; | 27 | let mut measurements = [0u16; DMA_BUF_LEN / 2]; |
| 28 | let mut ring_buffered_adc = adc.into_ring_buffered( | 28 | let mut ring_buffered_adc = adc.into_ring_buffered( |
| 29 | p.DMA1_CH1, | 29 | p.DMA1_CH1, |
| 30 | &mut adc_dma_buf, | 30 | &mut adc_dma_buf, |
| 31 | [ | 31 | [(adc_pin0, SampleTime::CYCLES640_5), (adc_pin1, SampleTime::CYCLES640_5)].into_iter(), |
| 32 | (&mut adc_pin0, SampleTime::CYCLES640_5), | ||
| 33 | (&mut adc_pin1, SampleTime::CYCLES640_5), | ||
| 34 | ] | ||
| 35 | .into_iter(), | ||
| 36 | ); | 32 | ); |
| 37 | 33 | ||
| 38 | info!("starting measurement loop"); | 34 | info!("starting measurement loop"); |
