Move comparator into analog

Author: mattico

examples/comp.rs

@@ -8,7 +8,7 @@ extern crate cortex_m_rt as rt;
 extern crate panic_halt;
 extern crate stm32g0xx_hal as hal;
 
-use hal::comparator::{Config, Hysteresis, RefintInput};
+use hal::analog::comparator::{Config, Hysteresis, RefintInput};
 use hal::prelude::*;
 use hal::stm32;
 use rt::entry;

examples/comp_window.rs

@@ -8,7 +8,7 @@ extern crate cortex_m_rt as rt;
 extern crate panic_halt;
 extern crate stm32g0xx_hal as hal;
 
-use hal::comparator::{self, Config, Hysteresis, RefintInput};
+use hal::analog::comparator::{self, Config, Hysteresis, RefintInput};
 use hal::prelude::*;
 use hal::stm32;
 use rt::entry;

src/comparator.rs renamed to src/analog/comparator.rs

@@ -1,3 +1,5 @@
 pub mod adc;
 #[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
+pub mod comparator;
+#[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
 pub mod dac;

src/analog/mod.rs

@@ -45,8 +45,6 @@ pub use stm32g0::stm32g070 as stm32;
 pub use crate::stm32::interrupt;
 
 pub mod analog;
-#[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
-pub mod comparator;
 pub mod crc;
 pub mod delay;
 pub mod dma;

src/lib.rs

@@ -6,15 +6,15 @@ pub use hal::watchdog::WatchdogEnable as _;
 
 pub use crate::analog::adc::AdcExt as _;
 #[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
-pub use crate::analog::dac::DacExt as _;
+pub use crate::analog::comparator::ComparatorExt as _;
 #[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
-pub use crate::analog::dac::DacOut as _;
+pub use crate::analog::comparator::ComparatorSplit as _;
 #[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
-pub use crate::comparator::ComparatorExt as _;
+pub use crate::analog::comparator::WindowComparatorExt as _;
 #[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
-pub use crate::comparator::ComparatorSplit as _;
+pub use crate::analog::dac::DacExt as _;
 #[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
-pub use crate::comparator::WindowComparatorExt as _;
+pub use crate::analog::dac::DacOut as _;
 pub use crate::crc::CrcExt as _;
 pub use crate::delay::DelayExt as _;
 // pub use crate::dma::CopyDma as _;