fast fix

Author: burrbull

.vscode/settings.json

@@ -1,11 +1,6 @@
 {
   "rust-analyzer.check.allTargets": false,
-  "rust-analyzer.check.extraArgs": [
-    "--examples",
-  ],
+  "rust-analyzer.check.extraArgs": ["--examples"],
   "rust-analyzer.cargo.target": "thumbv7em-none-eabihf",
-  "rust-analyzer.cargo.features": [
-    "stm32g473",
-    "defmt",
-  ]
-}
+  "rust-analyzer.cargo.features": ["stm32g473", "defmt"]
+}

examples/spi-sd.rs

@@ -37,7 +37,7 @@ fn main() -> ! {
     let gpiof = dp.GPIOF.split(&mut rcc);
 
     let cs = {
-        let mut cs = gpiof.pf8.into_push_pull_output();
+        let mut cs = gpiof.pf0.into_push_pull_output();
         cs.set_high();
         cs
     };

src/comparator.rs

@@ -13,7 +13,6 @@ use crate::gpio::{
     gpioa::{PA0, PA1, PA11, PA12, PA2, PA3, PA4, PA5, PA6, PA7},
     gpiob::{PB0, PB1, PB14, PB15, PB2, PB6, PB7, PB8, PB9},
     gpioc::PC2,
-    gpiof::PF4,
     Analog, OpenDrain, Output, PushPull, SignalEdge,
 };
 
@@ -28,6 +27,7 @@ use crate::gpio::{
     gpiob::{PB10, PB11, PB12, PB13},
     gpioc::{PC6, PC7, PC8},
     gpiod::{PD10, PD11, PD12, PD13, PD14, PD15},
+    gpiof::PF4,
 };
 
 use crate::gpio::gpioc::{PC0, PC1};
@@ -610,7 +610,6 @@ output_pin! {
     COMP1: PA6,  8,
     COMP1: PA11, 8,
     COMP1: PB8,  8,
-    COMP1: PF4,  2,
 
     COMP2: PA2,  8,
     COMP2: PA7,  8,
@@ -633,6 +632,8 @@ output_pin! {
     feature = "stm32g484",
 ))]
 output_pin! {
+    COMP1: PF4,  2,
+
     COMP5: PA9,  8,
     COMP5: PC7,  7,
 

src/serial/usart.rs

@@ -4,8 +4,7 @@ use core::marker::PhantomData;
 use crate::dma::{
     mux::DmaMuxResources, traits::TargetAddress, MemoryToPeripheral, PeripheralToMemory,
 };
-use crate::gpio::{gpioa::*, gpiob::*, gpioc::*, gpiod::*, gpioe::*, gpiog::*};
-use crate::gpio::{OpenDrain, AF12, AF5, AF7, AF8};
+use crate::gpio::{self, OpenDrain, AF12, AF5, AF7, AF8};
 use crate::rcc::{Enable, GetBusFreq, Rcc, RccBus, Reset};
 use crate::stm32::*;
 
@@ -164,15 +163,16 @@ macro_rules! uart_shared {
 
         $(
             $( #[ $pmeta1 ] )*
-            impl TxPin<$USARTX> for $PTX<$TAF> {
+            impl TxPin<$USARTX> for gpio::$PTX<$TAF> {
             }
-            impl TxPin<$USARTX> for $PTX<$TAF<OpenDrain>> {
+            $( #[ $pmeta1 ] )*
+            impl TxPin<$USARTX> for gpio::$PTX<$TAF<OpenDrain>> {
             }
         )+
 
         $(
             $( #[ $pmeta2 ] )*
-            impl RxPin<$USARTX> for $PRX<$RAF> {
+            impl RxPin<$USARTX> for gpio::$PRX<$RAF> {
             }
         )+