diff options
| author | Andres Vahter <[email protected]> | 2024-07-03 14:39:10 +0300 |
|---|---|---|
| committer | Andres Vahter <[email protected]> | 2024-07-03 15:20:31 +0300 |
| commit | f851081e09982a3edefd23082bb23143a0172464 (patch) | |
| tree | de03c185f2aa3317cd413bab7fc9efde4581f480 /examples/stm32f4/src/bin | |
| parent | 914d7c7919a8eac88f474d658a8078272318731b (diff) | |
stm32 adc: introduce blocking_read
Diffstat (limited to 'examples/stm32f4/src/bin')
| -rw-r--r-- | examples/stm32f4/src/bin/adc.rs | 8 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/adc_dma.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/stm32f4/src/bin/adc.rs b/examples/stm32f4/src/bin/adc.rs index 9473b7b7f..423d29225 100644 --- a/examples/stm32f4/src/bin/adc.rs +++ b/examples/stm32f4/src/bin/adc.rs | |||
| @@ -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.read(&mut vrefint); | 26 | let vrefint_sample = adc.blocking_read(&mut vrefint); |
| 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.read(&mut pin); | 53 | let v = adc.blocking_read(&mut pin); |
| 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.read(&mut temp); | 57 | let v = adc.blocking_read(&mut temp); |
| 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.read(&mut vrefint); | 62 | let v = adc.blocking_read(&mut vrefint); |
| 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 992bed573..43a761e6d 100644 --- a/examples/stm32f4/src/bin/adc_dma.rs +++ b/examples/stm32f4/src/bin/adc_dma.rs | |||
| @@ -44,7 +44,7 @@ async fn adc_task(mut p: Peripherals) { | |||
| 44 | let _ = adc.start(); | 44 | let _ = adc.start(); |
| 45 | let _ = adc2.start(); | 45 | let _ = adc2.start(); |
| 46 | loop { | 46 | loop { |
| 47 | match adc.read_exact(&mut buffer1).await { | 47 | match adc.read(&mut buffer1).await { |
| 48 | Ok(_data) => { | 48 | Ok(_data) => { |
| 49 | let toc = Instant::now(); | 49 | let toc = Instant::now(); |
| 50 | info!( | 50 | info!( |
| @@ -62,7 +62,7 @@ async fn adc_task(mut p: Peripherals) { | |||
| 62 | } | 62 | } |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | match adc2.read_exact(&mut buffer2).await { | 65 | match adc2.read(&mut buffer2).await { |
| 66 | Ok(_data) => { | 66 | Ok(_data) => { |
| 67 | let toc = Instant::now(); | 67 | let toc = Instant::now(); |
| 68 | info!( | 68 | info!( |
