NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

stm32/hrtim: cleanup merge issues

Browse source
This commit is contained in:
xoviat 2023-07-28 17:27:15 -05:00
parent c7c701b3e3
commit ec787d3518
3 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
embassy-stm32/src/hrtim/mod.rs
View file

@ -2,7 +2,7 @@ mod traits;
use core::marker::PhantomData; use core::marker::PhantomData;
use embassy_hal_common::{into_ref, PeripheralRef}; use embassy_hal_internal::{into_ref, PeripheralRef};
#[allow(unused_imports)] #[allow(unused_imports)]
use crate::gpio::sealed::{AFType, Pin}; use crate::gpio::sealed::{AFType, Pin};

12
embassy-stm32/src/hrtim/traits.rs
View file

@ -1,3 +1,4 @@
use crate::rcc::sealed::RccPeripheral;
use crate::time::Hertz; use crate::time::Hertz;
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
@ -92,7 +93,9 @@ impl HighResolutionControlPrescaler {
pub(crate) mod sealed { pub(crate) mod sealed {
use super::*; use super::*;
pub trait HighResolutionCaptureCompare16bitInstance: crate::timer::sealed::HighResolutionControlInstance { pub trait HighResolutionCaptureCompare16bitInstance: RccPeripheral {
fn regs() -> crate::pac::hrtim::Hrtim;
fn set_master_frequency(frequency: Hertz); fn set_master_frequency(frequency: Hertz);
fn set_channel_frequency(channnel: usize, frequency: Hertz); fn set_channel_frequency(channnel: usize, frequency: Hertz);
@ -114,9 +117,12 @@ pub trait HighResolutionCaptureCompare16bitInstance:
foreach_interrupt! { foreach_interrupt! {
($inst:ident, hrtim, HRTIM, MASTER, $irq:ident) => { ($inst:ident, hrtim, HRTIM, MASTER, $irq:ident) => {
impl sealed::HighResolutionCaptureCompare16bitInstance for crate::peripherals::$inst { impl sealed::HighResolutionCaptureCompare16bitInstance for crate::peripherals::$inst {
fn regs() -> crate::pac::hrtim::Hrtim {
crate::pac::$inst
}
fn set_master_frequency(frequency: Hertz) { fn set_master_frequency(frequency: Hertz) {
use crate::rcc::sealed::RccPeripheral; use crate::rcc::sealed::RccPeripheral;
use crate::timer::sealed::HighResolutionControlInstance;
let f = frequency.0; let f = frequency.0;
let timer_f = Self::frequency().0; let timer_f = Self::frequency().0;
@ -139,7 +145,6 @@ foreach_interrupt! {
fn set_channel_frequency(channel: usize, frequency: Hertz) { fn set_channel_frequency(channel: usize, frequency: Hertz) {
use crate::rcc::sealed::RccPeripheral; use crate::rcc::sealed::RccPeripheral;
use crate::timer::sealed::HighResolutionControlInstance;
let f = frequency.0; let f = frequency.0;
let timer_f = Self::frequency().0; let timer_f = Self::frequency().0;
@ -161,7 +166,6 @@ foreach_interrupt! {
} }
fn set_channel_dead_time(channel: usize, dead_time: u16) { fn set_channel_dead_time(channel: usize, dead_time: u16) {
use crate::timer::sealed::HighResolutionControlInstance;
let regs = Self::regs(); let regs = Self::regs();

13
embassy-stm32/src/timer/mod.rs
View file

@ -429,17 +429,4 @@ foreach_interrupt! {
}; };
($inst:ident, hrtim, HRTIM, MASTER, $irq:ident) => {
impl sealed::HighResolutionControlInstance for crate::peripherals::$inst {
type Interrupt = crate::interrupt::typelevel::$irq;
fn regs() -> crate::pac::hrtim::Hrtim {
crate::pac::$inst
}
}
impl HighResolutionControlInstance for crate::peripherals::$inst {
}
};
} }