From 08415e001e93a35579a8fc8e41147df96d80da84 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 10 Sep 2023 13:33:17 -0500
Subject: stm32/f3: add high res for hrtim and misc.

---
 examples/stm32f334/src/bin/adc.rs | 16 ++++++++++------
 examples/stm32f334/src/bin/pwm.rs |  2 ++
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'examples')

diff --git a/examples/stm32f334/src/bin/adc.rs b/examples/stm32f334/src/bin/adc.rs
index 6dffd6731..e8b2cd8a7 100644
--- a/examples/stm32f334/src/bin/adc.rs
+++ b/examples/stm32f334/src/bin/adc.rs
@@ -4,9 +4,9 @@
 
 use defmt::info;
 use embassy_executor::Spawner;
-use embassy_stm32::adc::{Adc, VREF_INT};
-use embassy_stm32::rcc::{ADCClock, ADCPrescaler};
-use embassy_stm32::time::Hertz;
+use embassy_stm32::adc::{Adc, SampleTime, VREF_INT};
+use embassy_stm32::rcc::AdcClockSource;
+use embassy_stm32::time::mhz;
 use embassy_stm32::Config;
 use embassy_time::{Delay, Duration, Timer};
 use {defmt_rtt as _, panic_probe as _};
@@ -14,9 +14,11 @@ use {defmt_rtt as _, panic_probe as _};
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) -> ! {
     let mut config = Config::default();
-    config.rcc.hse = Some(Hertz(8_000_000));
-    config.rcc.sysclk = Some(Hertz(16_000_000));
-    config.rcc.adc = Some(ADCClock::PLL(ADCPrescaler::Div1));
+    config.rcc.sysclk = Some(mhz(64));
+    config.rcc.hclk = Some(mhz(64));
+    config.rcc.pclk1 = Some(mhz(32));
+    config.rcc.pclk2 = Some(mhz(64));
+    config.rcc.adc = Some(AdcClockSource::PllDiv1);
 
     let mut p = embassy_stm32::init(config);
 
@@ -24,6 +26,8 @@ async fn main(_spawner: Spawner) -> ! {
 
     let mut adc = Adc::new(p.ADC1, &mut Delay);
 
+    adc.set_sample_time(SampleTime::Cycles601_5);
+
     info!("enable vrefint...");
 
     let mut vrefint = adc.enable_vref(&mut Delay);
diff --git a/examples/stm32f334/src/bin/pwm.rs b/examples/stm32f334/src/bin/pwm.rs
index 2660b10c5..aebc421b3 100644
--- a/examples/stm32f334/src/bin/pwm.rs
+++ b/examples/stm32f334/src/bin/pwm.rs
@@ -5,6 +5,7 @@
 use defmt::*;
 use embassy_executor::Spawner;
 use embassy_stm32::hrtim::*;
+use embassy_stm32::rcc::HrtimClockSource;
 use embassy_stm32::time::{khz, mhz};
 use embassy_stm32::Config;
 use embassy_time::{Duration, Timer};
@@ -17,6 +18,7 @@ async fn main(_spawner: Spawner) {
     config.rcc.hclk = Some(mhz(64));
     config.rcc.pclk1 = Some(mhz(32));
     config.rcc.pclk2 = Some(mhz(64));
+    config.rcc.hrtim = HrtimClockSource::PllClk;
 
     let p = embassy_stm32::init(config);
     info!("Hello World!");
-- 
cgit