Remove comp impl of devices other than g474

Author: usbalbin

examples/comp.rs

@@ -8,19 +8,29 @@
 #![no_main]
 #![no_std]
 
-use hal::comparator::{ComparatorExt, ComparatorSplit, Config, Hysteresis, RefintInput};
-use hal::gpio::GpioExt;
-use hal::prelude::OutputPin;
-use hal::rcc::RccExt;
-use stm32g4xx_hal as hal;
+
 mod utils;
 extern crate cortex_m_rt as rt;
 
-use hal::stm32;
+
 use rt::entry;
 
+#[cfg(not(feature = "stm32g474"))]
 #[entry]
 fn main() -> ! {
+    loop{} // TODO: add support for more devices
+}
+
+#[cfg(feature = "stm32g474")]
+#[entry]
+fn main() -> ! {
+    use hal::stm32;
+    use hal::comparator::{ComparatorExt, ComparatorSplit, Config, Hysteresis, RefintInput};
+    use hal::gpio::GpioExt;
+    use hal::prelude::OutputPin;
+    use hal::rcc::RccExt;
+    use stm32g4xx_hal as hal;
+
     let dp = stm32::Peripherals::take().expect("cannot take peripherals");
     let mut rcc = dp.RCC.constrain();
 

examples/comp_w_dac.rs

@@ -3,21 +3,29 @@
 #![no_main]
 #![no_std]
 
-use embedded_hal::Direction;
-use hal::comparator::{self, ComparatorExt, ComparatorSplit};
-use hal::dac::{Dac1IntSig1, DacExt, DacOut};
-use hal::delay::SYSTDelayExt;
-use hal::gpio::GpioExt;
-use hal::rcc::RccExt;
-use stm32g4xx_hal as hal;
 mod utils;
 extern crate cortex_m_rt as rt;
 
-use hal::stm32;
 use rt::entry;
 
+#[cfg(not(feature = "stm32g474"))]
 #[entry]
 fn main() -> ! {
+    loop{} // TODO: add support for more devices
+}
+
+#[cfg(feature = "stm32g474")]
+#[entry]
+fn main() -> ! {
+    use hal::stm32;
+    use embedded_hal::Direction;
+    use hal::comparator::{self, ComparatorExt, ComparatorSplit};
+    use hal::dac::{Dac1IntSig1, DacExt, DacOut};
+    use hal::delay::SYSTDelayExt;
+    use hal::gpio::GpioExt;
+    use hal::rcc::RccExt;
+    use stm32g4xx_hal as hal;
+
     let dp = stm32::Peripherals::take().expect("cannot take peripherals");
     let cp = cortex_m::Peripherals::take().expect("cannot take core peripherals");
 

src/comparator.rs

@@ -9,10 +9,18 @@ use core::marker::PhantomData;
 
 use crate::dac;
 use crate::exti::{Event as ExtiEvent, ExtiExt};
-use crate::gpio::gpioa::{PA0, PA1, PA11, PA12, PA2, PA3, PA4, PA5, PA6, PA7};
-use crate::gpio::gpiob::{PB0, PB1, PB14, PB2, PB6, PB7, PB8, PB9};
+use crate::gpio::gpioa::{PA0, PA1, PA2, PA3, PA4, PA5, PA7};
+use crate::gpio::gpiob::{PB0, PB1, PB2};
 use crate::gpio::*;
 
+#[cfg(any(feature = "stm32g474"))]
+use crate::gpio::{
+    gpiob::{PB6, PB7, PB8, PB9},
+    gpioc::PC2,
+    gpiof::PF4,
+    gpioa::{PA11, PA12, PA6},
+};
+
 #[cfg(any(
     feature = "stm32g473",
     feature = "stm32g483",
@@ -27,7 +35,7 @@ use crate::gpio::gpioa::{PA10, PA8, PA9};
     feature = "stm32g474",
     feature = "stm32g484"
 ))]
-use crate::gpio::gpiob::{PB10, PB11, PB12, PB13, PB15};
+use crate::gpio::gpiob::{PB10, PB11, PB12, PB13, PB14, PB15};
 
 #[cfg(any(
     feature = "stm32g473",
@@ -43,12 +51,11 @@ use crate::gpio::gpioc::{PC6, PC7, PC8};
     feature = "stm32g474",
     feature = "stm32g484"
 ))]
-use crate::gpio::gpiod::{PD10, PD11, PD12, PD13, PD15};
+use crate::gpio::gpiod::{PD10, PD11, PD12, PD13, PD14, PD15};
 
-use crate::gpio::gpioc::{PC0, PC1, PC2};
-use crate::gpio::gpiod::PD14;
+use crate::gpio::gpioc::{PC0, PC1};
 use crate::gpio::gpioe::{PE7, PE8};
-use crate::gpio::gpiof::{PF1, PF4};
+use crate::gpio::gpiof::PF1;
 use crate::rcc::{Clocks, Rcc};
 use crate::stm32::{COMP, EXTI};
 
@@ -773,6 +780,7 @@ pub trait OutputPin<COMP> {
     fn setup(self);
 }
 
+#[allow(unused_macros)] // TODO: add support for more devices
 macro_rules! output_pin {
     ($COMP:ident, $pin:ident, $AF:ident, $mode_t:ident, $into:ident) => {
         impl OutputPin<$COMP> for $pin<Output<$mode_t>> {
@@ -787,6 +795,9 @@ macro_rules! output_pin {
     )+};
 }
 
+// TODO: look up alternate functions for more devices than g474
+// https://www.mouser.se/datasheet/2/389/stm32g474cb-1600828.pdf#page=73
+#[cfg(feature = "stm32g474")]
 output_pin! {
     COMP1: PA0,  AF8,
     COMP1: PA6,  AF8,
@@ -808,11 +819,13 @@ output_pin! {
     COMP4: PB14, AF8,
 }
 
+// TODO: look up alternate functions for more devices than g474
+// https://www.mouser.se/datasheet/2/389/stm32g474cb-1600828.pdf#page=73
 #[cfg(any(
-    feature = "stm32g473",
-    feature = "stm32g483",
+    //feature = "stm32g473",
+    //feature = "stm32g483",
     feature = "stm32g474",
-    feature = "stm32g484"
+    //feature = "stm32g484"
 ))]
 output_pin! {
     COMP5: PA9,  AF8,