Expose capture, pwm and qei modules only for consistency

Author: eldruin

src/capture.rs

@@ -38,7 +38,7 @@ use nb;
 /// # impl U32Ext for u32 { fn ms(self) -> MilliSeconds { MilliSeconds(self) } }
 /// # struct Capture1;
 /// # enum Channel { _1 }
-/// # impl hal::Capture for Capture1 {
+/// # impl hal::capture::Capture for Capture1 {
 /// #     type Error = Infallible;
 /// #     type Capture = u16;
 /// #     type Channel = Channel;

src/lib.rs

@@ -688,20 +688,14 @@ extern crate nb;
 
 pub mod adc;
 pub mod blocking;
+pub mod capture;
 pub mod digital;
 pub mod fmt;
 pub mod prelude;
+pub mod pwm;
+pub mod qei;
 pub mod rng;
 pub mod serial;
 pub mod spi;
 pub mod timer;
 pub mod watchdog;
-
-mod capture;
-pub use capture::Capture;
-
-mod pwm;
-pub use pwm::{Pwm, PwmPin};
-
-mod qei;
-pub use qei::{Direction, Qei};

src/prelude.rs

@@ -15,9 +15,13 @@ pub use crate::blocking::serial::Write as _embedded_hal_blocking_serial_Write;
 pub use crate::blocking::spi::{
     Transfer as _embedded_hal_blocking_spi_Transfer, Write as _embedded_hal_blocking_spi_Write,
 };
+pub use crate::capture::Capture as _embedded_hal_Capture;
 pub use crate::digital::InputPin as _embedded_hal_digital_InputPin;
 pub use crate::digital::OutputPin as _embedded_hal_digital_OutputPin;
 pub use crate::digital::ToggleableOutputPin as _embedded_hal_digital_ToggleableOutputPin;
+pub use crate::pwm::Pwm as _embedded_hal_Pwm;
+pub use crate::pwm::PwmPin as _embedded_hal_PwmPin;
+pub use crate::qei::Qei as _embedded_hal_Qei;
 pub use crate::rng::Read as _embedded_hal_rng_Read;
 pub use crate::serial::Read as _embedded_hal_serial_Read;
 pub use crate::serial::Write as _embedded_hal_serial_Write;
@@ -26,7 +30,3 @@ pub use crate::timer::CountDown as _embedded_hal_timer_CountDown;
 pub use crate::watchdog::Watchdog as _embedded_hal_watchdog_Watchdog;
 pub use crate::watchdog::WatchdogDisable as _embedded_hal_watchdog_WatchdogDisable;
 pub use crate::watchdog::WatchdogEnable as _embedded_hal_watchdog_WatchdogEnable;
-pub use crate::Capture as _embedded_hal_Capture;
-pub use crate::Pwm as _embedded_hal_Pwm;
-pub use crate::PwmPin as _embedded_hal_PwmPin;
-pub use crate::Qei as _embedded_hal_Qei;

src/pwm.rs

@@ -34,7 +34,7 @@
 /// # impl U32Ext for u32 { fn khz(self) -> KiloHertz { KiloHertz(self) } }
 /// # enum Channel { _1, _2 }
 /// # struct Pwm1;
-/// # impl hal::Pwm for Pwm1 {
+/// # impl hal::pwm::Pwm for Pwm1 {
 /// #     type Error = Infallible;
 /// #     type Channel = Channel;
 /// #     type Time = KiloHertz;

src/qei.rs

@@ -38,11 +38,11 @@
 /// # trait U32Ext { fn s(self) -> Seconds; }
 /// # impl U32Ext for u32 { fn s(self) -> Seconds { Seconds(self) } }
 /// # struct Qei1;
-/// # impl hal::Qei for Qei1 {
+/// # impl hal::qei::Qei for Qei1 {
 /// #     type Error = Infallible;
 /// #     type Count = u16;
 /// #     fn try_count(&self) -> Result<u16, Self::Error> { Ok(0) }
-/// #     fn try_direction(&self) -> Result<::hal::Direction, Self::Error> { unimplemented!() }
+/// #     fn try_direction(&self) -> Result<::hal::qei::Direction, Self::Error> { unimplemented!() }
 /// # }
 /// # struct Timer6;
 /// # impl hal::timer::CountDown for Timer6 {