Add support for G491 and G4A1

Author: usbalbin

src/adc.rs

@@ -2848,6 +2848,15 @@ adc_op_follower!(
 ))]
 adc_op_pga!(
     opamp::opamp3::Pga<A, B> => (ADC3, 13),
+);
+
+#[cfg(any(
+    feature = "stm32g473",
+    feature = "stm32g474",
+    feature = "stm32g483",
+    feature = "stm32g484",
+))]
+adc_op_pga!(
     opamp::opamp4::Pga<A, B> => (ADC5, 5),
     opamp::opamp5::Pga<A, B> => (ADC5, 3),
     opamp::opamp6::Pga<A, B> => (ADC4, 17),

src/opamp.rs

@@ -545,7 +545,8 @@ macro_rules! opamps {
     };
 }
 
-#[cfg(any(feature = "stm32g431", feature = "stm32g441", feature = "stm32g471",))]
+// TODO: Figure out a way to not duplicate this 3 times
+#[cfg(any(feature = "stm32g431", feature = "stm32g441"))]
 opamps! {
     opamp1: {
         vinm0: PA3,
@@ -589,6 +590,63 @@ opamps! {
     },
 }
 
+#[cfg(any(feature = "stm32g471", feature = "stm32g491", feature = "stm32g4a1"))]
+opamps! {
+    opamp1: {
+        vinm0: PA3,
+        inverting: {
+            crate::gpio::gpioa::PA3<crate::gpio::Analog>: vinm0,
+            crate::gpio::gpioc::PC5<crate::gpio::Analog>: vinm1,
+        },
+        non_inverting: {
+            crate::gpio::gpioa::PA1<crate::gpio::Analog>: vinp0,
+            crate::gpio::gpioa::PA3<crate::gpio::Analog>: vinp1,
+            crate::gpio::gpioa::PA7<crate::gpio::Analog>: vinp2,
+        },
+        output: crate::gpio::gpioa::PA2<crate::gpio::Analog>,
+    },
+    opamp2: {
+        vinm0: PA5,
+        inverting: {
+            crate::gpio::gpioa::PA5<crate::gpio::Analog>: vinm0,
+            crate::gpio::gpioc::PC5<crate::gpio::Analog>: vinm1,
+        },
+        non_inverting: {
+            crate::gpio::gpioa::PA7<crate::gpio::Analog>: vinp0,
+            crate::gpio::gpiob::PB14<crate::gpio::Analog>: vinp1,
+            crate::gpio::gpiob::PB0<crate::gpio::Analog>: vinp2,
+            crate::gpio::gpiod::PD14<crate::gpio::Analog>: vinp3,
+        },
+        output: crate::gpio::gpioa::PA6<crate::gpio::Analog>,
+    },
+    opamp3: {
+        vinm0: PB2,
+        inverting: {
+            crate::gpio::gpiob::PB2<crate::gpio::Analog>: vinm0,
+            crate::gpio::gpiob::PB10<crate::gpio::Analog>: vinm1,
+        },
+        non_inverting: {
+            crate::gpio::gpiob::PB0<crate::gpio::Analog>: vinp0,
+            crate::gpio::gpiob::PB13<crate::gpio::Analog>: vinp1,
+            crate::gpio::gpioa::PA1<crate::gpio::Analog>: vinp2,
+        },
+        output: crate::gpio::gpiob::PB1<crate::gpio::Analog>,
+    },
+    opamp6: {
+        vinm0: PA1,
+        inverting: {
+            crate::gpio::gpioa::PA1<crate::gpio::Analog>: vinm0,
+            crate::gpio::gpiob::PB1<crate::gpio::Analog>: vinm1,
+        },
+        non_inverting: {
+            crate::gpio::gpiob::PB12<crate::gpio::Analog>: vinp0,
+            crate::gpio::gpiod::PD9<crate::gpio::Analog>: vinp1,
+            crate::gpio::gpiob::PB13<crate::gpio::Analog>: vinp2,
+        },
+        output: crate::gpio::gpiob::PB11<crate::gpio::Analog>,
+    },
+}
+
 #[cfg(any(
     feature = "stm32g473",
     feature = "stm32g474",

src/pwm.rs

@@ -874,7 +874,7 @@ pins! {
     feature = "stm32g483",
     feature = "stm32g484",
     feature = "stm32g491",
-    feature = "stm32g4a1"
+    feature = "stm32g4a1",
 ))]
 pins! {
     TIM20:

src/rcc/enable.rs

@@ -89,7 +89,9 @@ bus! {
     feature = "stm32g473",
     feature = "stm32g474",
     feature = "stm32g483",
-    feature = "stm32g484"
+    feature = "stm32g484",
+    feature = "stm32g491",
+    feature = "stm32g4a1",
 ))]
 bus! {
     ADC3 => (AHB2, 14),
@@ -158,6 +160,16 @@ bus! {
     FDCAN2 => (APB1_1, 25),
 }
 
+#[cfg(any(
+    feature = "stm32g473",
+    feature = "stm32g474",
+    feature = "stm32g483",
+    feature = "stm32g484",
+))]
+bus! {
+    FDCAN3 => (APB1_1, 25),
+}
+
 #[cfg(any(
     feature = "stm32g471",
     feature = "stm32g473",
@@ -167,10 +179,22 @@ bus! {
 ))]
 bus! {
     TIM5 => (APB1_1, 3),
-    UART5 => (APB1_1, 20),
     I2C4 => (APB1_2, 1),
 }
 
+#[cfg(any(
+    feature = "stm32g471",
+    feature = "stm32g473",
+    feature = "stm32g474",
+    feature = "stm32g483",
+    feature = "stm32g484",
+    feature = "stm32g491",
+    feature = "stm32g4a1",
+))]
+bus! {
+    UART5 => (APB1_1, 20),
+}
+
 bus! {
     SYSCFG => (APB2, 0),
     TIM1 => (APB2, 11),
@@ -198,10 +222,11 @@ bus! {
     feature = "stm32g473",
     feature = "stm32g474",
     feature = "stm32g483",
-    feature = "stm32g484"
+    feature = "stm32g484",
+    feature = "stm32g491",
+    feature = "stm32g4a1",
 ))]
 bus! {
-    FDCAN3 => (APB1_1, 25),
     TIM20 => (APB2, 20),
 }