Merge #342

342: RccBus r=therealprof a=burrbull



Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>

Author: bors[bot]

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- `RccBus` & `GetBusFreq` traits. `AHBx`, `APBx` structures.
 - Filler `NoPin` type 
 - Add inherent impl of `PwmPin` methods on `PwmChannel`s.
 - `Serial:tx` and `Serial::rx` that take only 1 pin

src/i2c.rs

@@ -250,19 +250,11 @@ pub enum Error {
     ARBITRATION,
 }
 
-mod private {
-    pub trait Sealed {}
-}
-
-pub trait Instance: private::Sealed + Deref<Target = i2c1::RegisterBlock> + Enable + Reset {}
+pub trait Instance: crate::Sealed + Deref<Target = i2c1::RegisterBlock> + Enable + Reset {}
 
-impl private::Sealed for I2C1 {}
 impl Instance for I2C1 {}
-impl private::Sealed for I2C2 {}
 impl Instance for I2C2 {}
 
-#[cfg(feature = "i2c3")]
-impl private::Sealed for I2C3 {}
 #[cfg(feature = "i2c3")]
 impl Instance for I2C3 {}
 

src/lib.rs

@@ -175,3 +175,8 @@ pub mod time;
 pub mod timer;
 #[cfg(feature = "device-selected")]
 pub mod watchdog;
+
+mod sealed {
+    pub trait Sealed {}
+}
+pub(crate) use sealed::Sealed;

src/pwm.rs

@@ -190,7 +190,7 @@ macro_rules! pwm_pin {
 }
 
 macro_rules! pwm_all_channels {
-    ($($TIMX:ident: ($timX:ident, $pclk:ident, $ppre:ident),)+) => {
+    ($($TIMX:ident: ($timX:ident),)+) => {
         $(
             impl Timer<$TIMX> {
                 pub fn pwm<P, PINS, T>(self, _pins: PINS, freq: T) -> PINS::Channels
@@ -257,7 +257,7 @@ macro_rules! pwm_all_channels {
 }
 
 macro_rules! pwm_2_channels {
-    ($($TIMX:ty: ($timX:ident, $pclk:ident, $ppre:ident),)+) => {
+    ($($TIMX:ty: ($timX:ident),)+) => {
         $(
             impl Timer<$TIMX> {
                 pub fn pwm<P, PINS, T>(self, _pins: PINS, freq: T) -> PINS::Channels
@@ -312,7 +312,7 @@ macro_rules! pwm_2_channels {
 }
 
 macro_rules! pwm_1_channel {
-    ($($TIMX:ty: ($timX:ident, $pclk:ident, $ppre:ident),)+) => {
+    ($($TIMX:ty: ($timX:ident),)+) => {
         $(
             impl Timer<$TIMX> {
                 pub fn pwm<P, PINS, T>(self, _pins: PINS, freq: T) -> PINS::Channels
@@ -420,7 +420,7 @@ macro_rules! pwm_pin_tim5 {
 
 #[cfg(feature = "stm32f410")]
 macro_rules! pwm_tim5_f410 {
-    ($($TIMX:ty: ($timX:ident, $pclk:ident, $ppre:ident),)+) => {
+    ($($TIMX:ty: ($timX:ident),)+) => {
         $(
             impl Timer<$TIMX> {
                 pub fn pwm<P, PINS, T>(self, _pins: PINS, freq: T) -> PINS::Channels
@@ -484,11 +484,11 @@ macro_rules! pwm_tim5_f410 {
     };
 }
 
-pwm_all_channels!(TIM1: (tim1, pclk2, ppre2),);
+pwm_all_channels!(TIM1: (tim1),);
 
-pwm_2_channels!(TIM9: (tim9, pclk2, ppre2),);
+pwm_2_channels!(TIM9: (tim9),);
 
-pwm_1_channel!(TIM11: (tim11, pclk2, ppre2),);
+pwm_1_channel!(TIM11: (tim11),);
 
 #[cfg(any(
     feature = "stm32f401",
@@ -508,12 +508,7 @@ pwm_1_channel!(TIM11: (tim11, pclk2, ppre2),);
     feature = "stm32f469",
     feature = "stm32f479"
 ))]
-pwm_all_channels!(
-    TIM2: (tim2, pclk1, ppre1),
-    TIM3: (tim3, pclk1, ppre1),
-    TIM4: (tim4, pclk1, ppre1),
-    TIM5: (tim5, pclk1, ppre1),
-);
+pwm_all_channels!(TIM2: (tim2), TIM3: (tim3), TIM4: (tim4), TIM5: (tim5),);
 
 #[cfg(any(
     feature = "stm32f401",
@@ -533,7 +528,7 @@ pwm_all_channels!(
     feature = "stm32f469",
     feature = "stm32f479"
 ))]
-pwm_1_channel!(TIM10: (tim10, pclk2, ppre2),);
+pwm_1_channel!(TIM10: (tim10),);
 
 #[cfg(any(
     feature = "stm32f405",
@@ -551,7 +546,7 @@ pwm_1_channel!(TIM10: (tim10, pclk2, ppre2),);
     feature = "stm32f469",
     feature = "stm32f479"
 ))]
-pwm_all_channels!(TIM8: (tim8, pclk2, ppre2),);
+pwm_all_channels!(TIM8: (tim8),);
 
 #[cfg(any(
     feature = "stm32f405",
@@ -569,7 +564,7 @@ pwm_all_channels!(TIM8: (tim8, pclk2, ppre2),);
     feature = "stm32f469",
     feature = "stm32f479"
 ))]
-pwm_2_channels!(TIM12: (tim12, pclk1, ppre1),);
+pwm_2_channels!(TIM12: (tim12),);
 
 #[cfg(any(
     feature = "stm32f405",
@@ -587,7 +582,7 @@ pwm_2_channels!(TIM12: (tim12, pclk1, ppre1),);
     feature = "stm32f469",
     feature = "stm32f479"
 ))]
-pwm_1_channel!(TIM13: (tim13, pclk1, ppre1), TIM14: (tim14, pclk1, ppre1),);
+pwm_1_channel!(TIM13: (tim13), TIM14: (tim14),);
 
 #[cfg(feature = "stm32f410")]
-pwm_tim5_f410!(TIM5: (tim5, pclk1, ppre1),);
+pwm_tim5_f410!(TIM5: (tim5),);

src/qei.rs

@@ -57,11 +57,7 @@ impl<TIM: Instance, PINS> hal::Qei for Qei<TIM, PINS> {
     }
 }
 
-mod sealed {
-    pub trait Sealed {}
-}
-
-pub trait Instance: sealed::Sealed {
+pub trait Instance: crate::Sealed {
     type Count;
 
     fn setup_clocks();
@@ -73,7 +69,6 @@ pub trait Instance: sealed::Sealed {
 macro_rules! hal {
     ($($TIM:ty: ($tim:ident, $bits:ident),)+) => {
         $(
-            impl sealed::Sealed for $TIM {}
             impl Instance for $TIM {
                 type Count = $bits;