aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32h7/src
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-07-23 14:16:51 +0000
committerGitHub <[email protected]>2022-07-23 14:16:51 +0000
commit6b8cd6fbb3e4dd23750550c50b301ebba70c443a (patch)
tree2b3975074c806fe2c2981b488e8f91be62be3660 /examples/stm32h7/src
parente61e36a8158073ec92df1a751cfdd7fce5004cf8 (diff)
parentb5ff7c5d60cd5cba905720b4b8f6cb8c73859ca6 (diff)
Merge #856
856: embassy-stm32/pwm: Generalize channel selection r=Dirbaio a=bgamari 550da471be7b56927b50b5955a6de0916ebe6b1f previously refactored the STM32 PWM logic in such a way to preclude use of non-contiguous channels (e.g. channel 2 but not channel 1). Refactor it yet again to yet again allow this sort of usage. Co-authored-by: Ben Gamari <[email protected]> Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'examples/stm32h7/src')
-rw-r--r--examples/stm32h7/src/bin/pwm.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/stm32h7/src/bin/pwm.rs b/examples/stm32h7/src/bin/pwm.rs
index f072c5375..730f637e9 100644
--- a/examples/stm32h7/src/bin/pwm.rs
+++ b/examples/stm32h7/src/bin/pwm.rs
@@ -5,7 +5,7 @@
5use defmt::*; 5use defmt::*;
6use embassy::executor::Spawner; 6use embassy::executor::Spawner;
7use embassy::time::{Duration, Timer}; 7use embassy::time::{Duration, Timer};
8use embassy_stm32::pwm::simple_pwm::SimplePwm; 8use embassy_stm32::pwm::simple_pwm::{PwmPin, SimplePwm};
9use embassy_stm32::pwm::Channel; 9use embassy_stm32::pwm::Channel;
10use embassy_stm32::time::{khz, mhz}; 10use embassy_stm32::time::{khz, mhz};
11use embassy_stm32::{Config, Peripherals}; 11use embassy_stm32::{Config, Peripherals};
@@ -27,7 +27,8 @@ pub fn config() -> Config {
27async fn main(_spawner: Spawner, p: Peripherals) { 27async fn main(_spawner: Spawner, p: Peripherals) {
28 info!("Hello World!"); 28 info!("Hello World!");
29 29
30 let mut pwm = SimplePwm::new_1ch(p.TIM3, p.PA6, khz(10)); 30 let ch1 = PwmPin::new_ch1(p.PA6);
31 let mut pwm = SimplePwm::new(p.TIM3, Some(ch1), None, None, None, khz(10));
31 let max = pwm.get_max_duty(); 32 let max = pwm.get_max_duty();
32 pwm.enable(Channel::Ch1); 33 pwm.enable(Channel::Ch1);
33 34