aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32f4/src
diff options
context:
space:
mode:
authorGrant Miller <[email protected]>2024-09-06 13:53:49 -0500
committerGrant Miller <[email protected]>2024-09-06 13:53:49 -0500
commit1a8977db7837a5635d3c5e0ae8213d1b3181ffb7 (patch)
tree5bceb855c421f6572aa1909d997bd6d9dda3b895 /examples/stm32f4/src
parentcfc76cec711447300e2d957439a32d6ad418a58c (diff)
Update examples
Diffstat (limited to 'examples/stm32f4/src')
-rw-r--r--examples/stm32f4/src/bin/pwm.rs18
-rw-r--r--examples/stm32f4/src/bin/ws2812_pwm.rs4
2 files changed, 11 insertions, 11 deletions
diff --git a/examples/stm32f4/src/bin/pwm.rs b/examples/stm32f4/src/bin/pwm.rs
index 8844a9f0e..0cd65a258 100644
--- a/examples/stm32f4/src/bin/pwm.rs
+++ b/examples/stm32f4/src/bin/pwm.rs
@@ -15,22 +15,22 @@ async fn main(_spawner: Spawner) {
15 let p = embassy_stm32::init(Default::default()); 15 let p = embassy_stm32::init(Default::default());
16 info!("Hello World!"); 16 info!("Hello World!");
17 17
18 let ch1 = PwmPin::new_ch1(p.PE9, OutputType::PushPull); 18 let ch1_pin = PwmPin::new_ch1(p.PE9, OutputType::PushPull);
19 let mut pwm = SimplePwm::new(p.TIM1, Some(ch1), None, None, None, khz(10), Default::default()); 19 let mut pwm = SimplePwm::new(p.TIM1, Some(ch1_pin), None, None, None, khz(10), Default::default());
20 let max = pwm.get_max_duty(); 20 let mut ch1 = pwm.ch1();
21 pwm.enable(Channel::Ch1); 21 ch1.enable();
22 22
23 info!("PWM initialized"); 23 info!("PWM initialized");
24 info!("PWM max duty {}", max); 24 info!("PWM max duty {}", ch1.max_duty_cycle());
25 25
26 loop { 26 loop {
27 pwm.set_duty(Channel::Ch1, 0); 27 ch1.set_duty_cycle_fully_off();
28 Timer::after_millis(300).await; 28 Timer::after_millis(300).await;
29 pwm.set_duty(Channel::Ch1, max / 4); 29 ch1.set_duty_cycle_fraction(1, 4);
30 Timer::after_millis(300).await; 30 Timer::after_millis(300).await;
31 pwm.set_duty(Channel::Ch1, max / 2); 31 ch1.set_dutycycle_fraction(1, 2);
32 Timer::after_millis(300).await; 32 Timer::after_millis(300).await;
33 pwm.set_duty(Channel::Ch1, max - 1); 33 ch1.set_duty_cycle(ch1.max_duty_cycle() - 1);
34 Timer::after_millis(300).await; 34 Timer::after_millis(300).await;
35 } 35 }
36} 36}
diff --git a/examples/stm32f4/src/bin/ws2812_pwm.rs b/examples/stm32f4/src/bin/ws2812_pwm.rs
index cbaff75fc..7a9fa302b 100644
--- a/examples/stm32f4/src/bin/ws2812_pwm.rs
+++ b/examples/stm32f4/src/bin/ws2812_pwm.rs
@@ -61,7 +61,7 @@ async fn main(_spawner: Spawner) {
61 // construct ws2812 non-return-to-zero (NRZ) code bit by bit 61 // construct ws2812 non-return-to-zero (NRZ) code bit by bit
62 // ws2812 only need 24 bits for each LED, but we add one bit more to keep PWM output low 62 // ws2812 only need 24 bits for each LED, but we add one bit more to keep PWM output low
63 63
64 let max_duty = ws2812_pwm.get_max_duty() as u16; 64 let max_duty = ws2812_pwm.max_duty_cycle();
65 let n0 = 8 * max_duty / 25; // ws2812 Bit 0 high level timing 65 let n0 = 8 * max_duty / 25; // ws2812 Bit 0 high level timing
66 let n1 = 2 * n0; // ws2812 Bit 1 high level timing 66 let n1 = 2 * n0; // ws2812 Bit 1 high level timing
67 67
@@ -84,7 +84,7 @@ async fn main(_spawner: Spawner) {
84 let pwm_channel = Channel::Ch1; 84 let pwm_channel = Channel::Ch1;
85 85
86 // make sure PWM output keep low on first start 86 // make sure PWM output keep low on first start
87 ws2812_pwm.set_duty(pwm_channel, 0); 87 ws2812_pwm.channel(pwm_channel).set_duty(0);
88 88
89 // flip color at 2 Hz 89 // flip color at 2 Hz
90 let mut ticker = Ticker::every(Duration::from_millis(500)); 90 let mut ticker = Ticker::every(Duration::from_millis(500));