max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor: Fix v4 RccPeripheral bounds

Browse Source
This commit is contained in:
Grant Miller 2022-10-26 17:59:44 -05:00
parent 9c30d565b9
commit 4f2dcca34b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embassy-stm32/src/adc/mod.rs
View File

@ -44,9 +44,9 @@ pub(crate) mod sealed {
} }
} }
#[cfg(not(any(adc_f1, adc_v2)))] #[cfg(not(any(adc_f1, adc_v2, adc_v4)))]
pub trait Instance: sealed::Instance + 'static {} pub trait Instance: sealed::Instance + 'static {}
#[cfg(any(adc_f1, adc_v2))] #[cfg(any(adc_f1, adc_v2, adc_v4))]
pub trait Instance: sealed::Instance + crate::rcc::RccPeripheral + 'static {} pub trait Instance: sealed::Instance + crate::rcc::RccPeripheral + 'static {}
pub trait AdcPin<T: Instance>: sealed::AdcPin<T> {} pub trait AdcPin<T: Instance>: sealed::AdcPin<T> {}

2
embassy-stm32/src/adc/v4.rs
View File

@ -225,7 +225,7 @@ impl Prescaler {
} }
} }
impl<'d, T: Instance + crate::rcc::RccPeripheral> Adc<'d, T> { impl<'d, T: Instance> Adc<'d, T> {
pub fn new(_peri: impl Peripheral<P = T> + 'd, delay: &mut impl DelayUs<u16>) -> Self { pub fn new(_peri: impl Peripheral<P = T> + 'd, delay: &mut impl DelayUs<u16>) -> Self {
embassy_hal_common::into_ref!(_peri); embassy_hal_common::into_ref!(_peri);
T::enable(); T::enable();