Fix example for smaller processors

Author: usbalbin

examples/opamp.rs

@@ -6,7 +6,6 @@
 use stm32g4xx_hal::adc::AdcClaim;
 use stm32g4xx_hal::adc::ClockSource;
 use stm32g4xx_hal::gpio::gpioa::*;
-use stm32g4xx_hal::gpio::gpiob::*;
 use stm32g4xx_hal::gpio::Analog;
 use stm32g4xx_hal::opamp::opamp1::IntoPga as _;
 use stm32g4xx_hal::opamp::opamp2::IntoPga as _;
@@ -36,22 +35,20 @@ fn main() -> ! {
     let gpiob = dp.GPIOB.split(&mut rcc);
 
     // setup opamps
-    let (opamp1, opamp2, opamp3, opamp4, ..) = dp.OPAMP.split(&mut rcc);
+    let (opamp1, opamp2, opamp3, ..) = dp.OPAMP.split(&mut rcc);
 
     // Set up opamp1 and opamp2 in follower mode
     let opamp1 = opamp1.follower(gpioa.pa1, Some(gpioa.pa2));
     let opamp2 = opamp2.follower(gpioa.pa7, Option::<PA6<Analog>>::None);
 
     // Set up opamp1 and opamp2 in open loop mode
     let opamp3 = opamp3.open_loop(gpiob.pb0, gpiob.pb2, Some(gpiob.pb1));
-    let opamp4 = opamp4.open_loop(gpiob.pb11, gpiob.pb10, Option::<PB12<Analog>>::None);
 
     // disable opamps
     let (opamp1, pa1, some_pa2) = opamp1.disable();
     let (opamp2, pa7, _none) = opamp2.disable();
 
     let (_opamp3, _pb0, _pb2, _some_pb1) = opamp3.disable();
-    let (_opamp4, _pb11, _pb10, _none) = opamp4.disable();
 
     // Configure opamp1 with pa1 as non-inverting input and set gain to x2
     let _opamp1 = opamp1.pga(

src/adc.rs

@@ -2351,27 +2351,25 @@ adc_pins!(
 );
 
 // See https://www.st.com/resource/en/reference_manual/rm0440-stm32g4-series-advanced-armbased-32bit-mcus-stmicroelectronics.pdf#page=782
-#[cfg(any(
-    feature = "stm32g473",
-    feature = "stm32g474",
-    feature = "stm32g483",
-    feature = "stm32g484",
-))]
 adc_op!(
     // TODO: Add all opamp types: Follower, OpenLoop
     // TODO: Should we restrict type parameters A and B?
     // TODO: Also allow AD-channels shared by pins
-
     opamp::opamp1::Pga<A, B> => (ADC1, 13),
-
     opamp::opamp2::Pga<A, B> => (ADC2, 16),
-
     opamp::opamp3::Pga<A, B> => (ADC2, 18),
+);
 
+#[cfg(any(
+    feature = "stm32g471",
+    feature = "stm32g473",
+    feature = "stm32g474",
+    feature = "stm32g483",
+    feature = "stm32g484",
+))]
+adc_op!(
     opamp::opamp4::Pga<A, B> => (ADC5, 5),
-
     opamp::opamp5::Pga<A, B> => (ADC5, 3),
-
     opamp::opamp6::Pga<A, B> => (ADC4, 17),
 );