diff options
| author | Gabriel Smith <[email protected]> | 2024-11-21 17:23:46 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-11-21 23:23:46 +0100 |
| commit | bd65906d149719ef3da214e72876b13579e8d392 (patch) | |
| tree | d45a4cfa8a5c41960401df945e02db21d0ce7e1a | |
| parent | 4b1be4787acfb23b3c95c895485843542b44cb97 (diff) | |
STM32H5xx ADC (#3557)
* stm32: Update STM32 data source
* stm32h5: Add ADC example
| -rw-r--r-- | embassy-stm32/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/lib.rs | 2 | ||||
| -rw-r--r-- | examples/stm32h5/src/bin/adc.rs | 59 |
3 files changed, 62 insertions, 3 deletions
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 4fe4ff358..91d218da4 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -72,7 +72,7 @@ rand_core = "0.6.3" | |||
| 72 | sdio-host = "0.5.0" | 72 | sdio-host = "0.5.0" |
| 73 | critical-section = "1.1" | 73 | critical-section = "1.1" |
| 74 | #stm32-metapac = { version = "15" } | 74 | #stm32-metapac = { version = "15" } |
| 75 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-7bb5f235587c3a6886a7be1c8f58fdf22c5257f3" } | 75 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-55b491ee982e52f80a21276a0ccbde4907982b5d" } |
| 76 | 76 | ||
| 77 | vcell = "0.1.3" | 77 | vcell = "0.1.3" |
| 78 | nb = "1.0.0" | 78 | nb = "1.0.0" |
| @@ -101,7 +101,7 @@ proc-macro2 = "1.0.36" | |||
| 101 | quote = "1.0.15" | 101 | quote = "1.0.15" |
| 102 | 102 | ||
| 103 | #stm32-metapac = { version = "15", default-features = false, features = ["metadata"]} | 103 | #stm32-metapac = { version = "15", default-features = false, features = ["metadata"]} |
| 104 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-7bb5f235587c3a6886a7be1c8f58fdf22c5257f3", default-features = false, features = ["metadata"] } | 104 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-55b491ee982e52f80a21276a0ccbde4907982b5d", default-features = false, features = ["metadata"] } |
| 105 | 105 | ||
| 106 | [features] | 106 | [features] |
| 107 | default = ["rt"] | 107 | default = ["rt"] |
diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs index e189351d1..39f3dfd61 100644 --- a/embassy-stm32/src/lib.rs +++ b/embassy-stm32/src/lib.rs | |||
| @@ -440,7 +440,7 @@ fn init_hw(config: Config) -> Peripherals { | |||
| 440 | cr.set_stop(config.enable_debug_during_sleep); | 440 | cr.set_stop(config.enable_debug_during_sleep); |
| 441 | cr.set_standby(config.enable_debug_during_sleep); | 441 | cr.set_standby(config.enable_debug_during_sleep); |
| 442 | } | 442 | } |
| 443 | #[cfg(any(dbgmcu_f0, dbgmcu_c0, dbgmcu_g0, dbgmcu_u5, dbgmcu_wba, dbgmcu_l5))] | 443 | #[cfg(any(dbgmcu_f0, dbgmcu_c0, dbgmcu_g0, dbgmcu_u0, dbgmcu_u5, dbgmcu_wba, dbgmcu_l5))] |
| 444 | { | 444 | { |
| 445 | cr.set_dbg_stop(config.enable_debug_during_sleep); | 445 | cr.set_dbg_stop(config.enable_debug_during_sleep); |
| 446 | cr.set_dbg_standby(config.enable_debug_during_sleep); | 446 | cr.set_dbg_standby(config.enable_debug_during_sleep); |
diff --git a/examples/stm32h5/src/bin/adc.rs b/examples/stm32h5/src/bin/adc.rs new file mode 100644 index 000000000..c5d508ece --- /dev/null +++ b/examples/stm32h5/src/bin/adc.rs | |||
| @@ -0,0 +1,59 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | |||
| 4 | use defmt::*; | ||
| 5 | use embassy_executor::Spawner; | ||
| 6 | use embassy_stm32::adc::{Adc, SampleTime}; | ||
| 7 | use embassy_stm32::Config; | ||
| 8 | use embassy_time::Timer; | ||
| 9 | use {defmt_rtt as _, panic_probe as _}; | ||
| 10 | |||
| 11 | #[embassy_executor::main] | ||
| 12 | async fn main(_spawner: Spawner) { | ||
| 13 | let mut config = Config::default(); | ||
| 14 | { | ||
| 15 | use embassy_stm32::rcc::*; | ||
| 16 | config.rcc.hsi = Some(HSIPrescaler::DIV1); | ||
| 17 | config.rcc.csi = true; | ||
| 18 | config.rcc.pll1 = Some(Pll { | ||
| 19 | source: PllSource::HSI, | ||
| 20 | prediv: PllPreDiv::DIV4, | ||
| 21 | mul: PllMul::MUL25, | ||
| 22 | divp: Some(PllDiv::DIV2), | ||
| 23 | divq: Some(PllDiv::DIV4), // SPI1 cksel defaults to pll1_q | ||
| 24 | divr: None, | ||
| 25 | }); | ||
| 26 | config.rcc.pll2 = Some(Pll { | ||
| 27 | source: PllSource::HSI, | ||
| 28 | prediv: PllPreDiv::DIV4, | ||
| 29 | mul: PllMul::MUL25, | ||
| 30 | divp: None, | ||
| 31 | divq: None, | ||
| 32 | divr: Some(PllDiv::DIV4), // 100mhz | ||
| 33 | }); | ||
| 34 | config.rcc.sys = Sysclk::PLL1_P; // 200 Mhz | ||
| 35 | config.rcc.ahb_pre = AHBPrescaler::DIV1; // 200 Mhz | ||
| 36 | config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz | ||
| 37 | config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz | ||
| 38 | config.rcc.apb3_pre = APBPrescaler::DIV2; // 100 Mhz | ||
| 39 | config.rcc.voltage_scale = VoltageScale::Scale1; | ||
| 40 | config.rcc.mux.adcdacsel = mux::Adcdacsel::PLL2_R; | ||
| 41 | } | ||
| 42 | let mut p = embassy_stm32::init(config); | ||
| 43 | |||
| 44 | info!("Hello World!"); | ||
| 45 | |||
| 46 | let mut adc = Adc::new(p.ADC1); | ||
| 47 | |||
| 48 | adc.set_sample_time(SampleTime::CYCLES24_5); | ||
| 49 | |||
| 50 | let mut vrefint_channel = adc.enable_vrefint(); | ||
| 51 | |||
| 52 | loop { | ||
| 53 | let vrefint = adc.blocking_read(&mut vrefint_channel); | ||
| 54 | info!("vrefint: {}", vrefint); | ||
| 55 | let measured = adc.blocking_read(&mut p.PA0); | ||
| 56 | info!("measured: {}", measured); | ||
| 57 | Timer::after_millis(500).await; | ||
| 58 | } | ||
| 59 | } | ||
