nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-22 14:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename get_width_ticks and add info!() in examples

Browse Source
This commit is contained in:
Bruno Bousquet 2024-05-29 09:58:46 -04:00
parent a23fa8dcb2
commit 292c1dd0b8
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embassy-stm32/src/timer/pwm_input.rs
View File

@ -114,8 +114,8 @@ impl<'d, T: GeneralInstance4Channel> PwmInput<'d, T> {
self.inner.get_capture_value(self.channel) self.inner.get_capture_value(self.channel)
} }
/// Get the duty tick count /// Get the pulse width tick count
pub fn get_duty_ticks(&self) -> u32 { pub fn get_width_ticks(&self) -> u32 {
self.inner.get_capture_value(match self.channel { self.inner.get_capture_value(match self.channel {
Channel::Ch1 => Channel::Ch2, Channel::Ch1 => Channel::Ch2,
Channel::Ch2 => Channel::Ch1, Channel::Ch2 => Channel::Ch1,
@ -129,6 +129,6 @@ impl<'d, T: GeneralInstance4Channel> PwmInput<'d, T> {
if period == 0 { if period == 0 {
return 0.; return 0.;
} }
100. * (self.get_duty_ticks() as f32) / (period as f32) 100. * (self.get_width_ticks() as f32) / (period as f32)
} }
} }

9
examples/stm32f1/src/bin/pwm_input.rs
View File

@ -1,7 +1,6 @@
#![no_std] #![no_std]
#![no_main] #![no_main]
use cortex_m::asm;
use defmt::*; use defmt::*;
use embassy_executor::Spawner; use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Pull, Speed}; use embassy_stm32::gpio::{Level, Output, Pull, Speed};
@ -44,9 +43,9 @@ async fn main(spawner: Spawner) {
loop { loop {
Timer::after_millis(500).await; Timer::after_millis(500).await;
let _per = pwm_input.get_period_ticks(); let period = pwm_input.get_period_ticks();
let _dc = pwm_input.get_duty_ticks(); let width = pwm_input.get_width_ticks();
let _pc = pwm_input.get_duty_cycle(); let duty_cycle = pwm_input.get_duty_cycle();
asm::nop(); info!("period ticks: {} width ticks: {} duty cycle: {}", period, width, duty_cycle);
} }
} }

9
examples/stm32f4/src/bin/pwm_input.rs
View File

@ -1,7 +1,6 @@
#![no_std] #![no_std]
#![no_main] #![no_main]
use cortex_m::asm;
use defmt::*; use defmt::*;
use embassy_executor::Spawner; use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Pull, Speed}; use embassy_stm32::gpio::{Level, Output, Pull, Speed};
@ -44,9 +43,9 @@ async fn main(spawner: Spawner) {
loop { loop {
Timer::after_millis(500).await; Timer::after_millis(500).await;
let _per = pwm_input.get_period_ticks(); let period = pwm_input.get_period_ticks();
let _dc = pwm_input.get_duty_ticks(); let width = pwm_input.get_width_ticks();
let _pc = pwm_input.get_duty_cycle(); let duty_cycle = pwm_input.get_duty_cycle();
asm::nop(); info!("period ticks: {} width ticks: {} duty cycle: {}", period, width, duty_cycle);
} }
} }