fix incorrect default pin modes (#285)

Author: burrbull

src/gpio.rs

@@ -49,6 +49,8 @@ pub struct OpenDrain;
 /// Analog mode (type state)
 pub struct Analog;
 
+pub type Debugger = Alternate<PushPull, 0>;
+
 /// GPIO Pin speed selection
 pub enum Speed {
     Low = 0,
@@ -240,17 +242,7 @@ macro_rules! gpio {
             use crate::stm32::$GPIOX;
 
             use crate::rcc::{AHB2, Enable, Reset};
-            use super::{
-                Afr,
-                Pin,
-                Floating, GpioExt, Input,
-                H8,
-                L8,
-                MODER,
-                OTYPER,
-                OSPEEDR,
-                PUPDR,
-            };
+            use super::{Afr, Analog, GpioExt, Pin, H8, L8, MODER, OTYPER, OSPEEDR, PUPDR};
 
             /// GPIO parts
             pub struct Parts {
@@ -615,98 +607,98 @@ af!(H8, AFRH, afrh);
 af!(L8, AFRL, afrl);
 
 gpio!(GPIOA, gpioa, PAx, 'A', 0, [
-    PA0: (pa0, 0, Input<Floating>, L8, exticr1),
-    PA1: (pa1, 1, Input<Floating>, L8, exticr1),
-    PA2: (pa2, 2, Input<Floating>, L8, exticr1),
-    PA3: (pa3, 3, Input<Floating>, L8, exticr1),
-    PA4: (pa4, 4, Input<Floating>, L8, exticr2),
-    PA5: (pa5, 5, Input<Floating>, L8, exticr2),
-    PA6: (pa6, 6, Input<Floating>, L8, exticr2),
-    PA7: (pa7, 7, Input<Floating>, L8, exticr2),
-    PA8: (pa8, 8, Input<Floating>, H8, exticr3),
-    PA9: (pa9, 9, Input<Floating>, H8, exticr3),
-    PA10: (pa10, 10, Input<Floating>, H8, exticr3),
-    PA11: (pa11, 11, Input<Floating>, H8, exticr3),
-    PA12: (pa12, 12, Input<Floating>, H8, exticr4),
-    PA13: (pa13, 13, Input<Floating>, H8, exticr4),
-    PA14: (pa14, 14, Input<Floating>, H8, exticr4),
-    PA15: (pa15, 15, Input<Floating>, H8, exticr4),
+    PA0: (pa0, 0, Analog, L8, exticr1),
+    PA1: (pa1, 1, Analog, L8, exticr1),
+    PA2: (pa2, 2, Analog, L8, exticr1),
+    PA3: (pa3, 3, Analog, L8, exticr1),
+    PA4: (pa4, 4, Analog, L8, exticr2),
+    PA5: (pa5, 5, Analog, L8, exticr2),
+    PA6: (pa6, 6, Analog, L8, exticr2),
+    PA7: (pa7, 7, Analog, L8, exticr2),
+    PA8: (pa8, 8, Analog, H8, exticr3),
+    PA9: (pa9, 9, Analog, H8, exticr3),
+    PA10: (pa10, 10, Analog, H8, exticr3),
+    PA11: (pa11, 11, Analog, H8, exticr3),
+    PA12: (pa12, 12, Analog, H8, exticr4),
+    PA13: (pa13, 13, super::Debugger, H8, exticr4), // SWDIO, PullUp VeryHigh speed
+    PA14: (pa14, 14, super::Debugger, H8, exticr4), // SWCLK, PullDown
+    PA15: (pa15, 15, super::Debugger, H8, exticr4), // JTDI, PullUp
 ]);
 
 gpio!(GPIOB, gpiob, PBx, 'B', 1, [
-    PB0: (pb0, 0, Input<Floating>, L8, exticr1),
-    PB1: (pb1, 1, Input<Floating>, L8, exticr1),
-    PB2: (pb2, 2, Input<Floating>, L8, exticr1),
-    PB3: (pb3, 3, Input<Floating>, L8, exticr1),
-    PB4: (pb4, 4, Input<Floating>, L8, exticr2),
-    PB5: (pb5, 5, Input<Floating>, L8, exticr2),
-    PB6: (pb6, 6, Input<Floating>, L8, exticr2),
-    PB7: (pb7, 7, Input<Floating>, L8, exticr2),
-    PB8: (pb8, 8, Input<Floating>, H8, exticr3),
-    PB9: (pb9, 9, Input<Floating>, H8, exticr3),
-    PB10: (pb10, 10, Input<Floating>, H8, exticr3),
-    PB11: (pb11, 11, Input<Floating>, H8, exticr3),
-    PB12: (pb12, 12, Input<Floating>, H8, exticr4),
-    PB13: (pb13, 13, Input<Floating>, H8, exticr4),
-    PB14: (pb14, 14, Input<Floating>, H8, exticr4),
-    PB15: (pb15, 15, Input<Floating>, H8, exticr4),
+    PB0: (pb0, 0, Analog, L8, exticr1),
+    PB1: (pb1, 1, Analog, L8, exticr1),
+    PB2: (pb2, 2, Analog, L8, exticr1),
+    PB3: (pb3, 3, super::Debugger, L8, exticr1), // SWO
+    PB4: (pb4, 4, super::Debugger, L8, exticr2), // JTRST, PullUp
+    PB5: (pb5, 5, Analog, L8, exticr2),
+    PB6: (pb6, 6, Analog, L8, exticr2),
+    PB7: (pb7, 7, Analog, L8, exticr2),
+    PB8: (pb8, 8, Analog, H8, exticr3),
+    PB9: (pb9, 9, Analog, H8, exticr3),
+    PB10: (pb10, 10, Analog, H8, exticr3),
+    PB11: (pb11, 11, Analog, H8, exticr3),
+    PB12: (pb12, 12, Analog, H8, exticr4),
+    PB13: (pb13, 13, Analog, H8, exticr4),
+    PB14: (pb14, 14, Analog, H8, exticr4),
+    PB15: (pb15, 15, Analog, H8, exticr4),
 ]);
 
 gpio!(GPIOC, gpioc, PCx, 'C', 2, [
-    PC0: (pc0, 0, Input<Floating>, L8, exticr1),
-    PC1: (pc1, 1, Input<Floating>, L8, exticr1),
-    PC2: (pc2, 2, Input<Floating>, L8, exticr1),
-    PC3: (pc3, 3, Input<Floating>, L8, exticr1),
-    PC4: (pc4, 4, Input<Floating>, L8, exticr2),
-    PC5: (pc5, 5, Input<Floating>, L8, exticr2),
-    PC6: (pc6, 6, Input<Floating>, L8, exticr2),
-    PC7: (pc7, 7, Input<Floating>, L8, exticr2),
-    PC8: (pc8, 8, Input<Floating>, H8, exticr3),
-    PC9: (pc9, 9, Input<Floating>, H8, exticr3),
-    PC10: (pc10, 10, Input<Floating>, H8, exticr3),
-    PC11: (pc11, 11, Input<Floating>, H8, exticr3),
-    PC12: (pc12, 12, Input<Floating>, H8, exticr4),
-    PC13: (pc13, 13, Input<Floating>, H8, exticr4),
-    PC14: (pc14, 14, Input<Floating>, H8, exticr4),
-    PC15: (pc15, 15, Input<Floating>, H8, exticr4),
+    PC0: (pc0, 0, Analog, L8, exticr1),
+    PC1: (pc1, 1, Analog, L8, exticr1),
+    PC2: (pc2, 2, Analog, L8, exticr1),
+    PC3: (pc3, 3, Analog, L8, exticr1),
+    PC4: (pc4, 4, Analog, L8, exticr2),
+    PC5: (pc5, 5, Analog, L8, exticr2),
+    PC6: (pc6, 6, Analog, L8, exticr2),
+    PC7: (pc7, 7, Analog, L8, exticr2),
+    PC8: (pc8, 8, Analog, H8, exticr3),
+    PC9: (pc9, 9, Analog, H8, exticr3),
+    PC10: (pc10, 10, Analog, H8, exticr3),
+    PC11: (pc11, 11, Analog, H8, exticr3),
+    PC12: (pc12, 12, Analog, H8, exticr4),
+    PC13: (pc13, 13, Analog, H8, exticr4),
+    PC14: (pc14, 14, Analog, H8, exticr4),
+    PC15: (pc15, 15, Analog, H8, exticr4),
 ]);
 
 gpio!(GPIOD, gpiod, PDx, 'D', 3, [
-    PD0: (pd0, 0, Input<Floating>, L8, exticr1),
-    PD1: (pd1, 1, Input<Floating>, L8, exticr1),
-    PD2: (pd2, 2, Input<Floating>, L8, exticr1),
-    PD3: (pd3, 3, Input<Floating>, L8, exticr1),
-    PD4: (pd4, 4, Input<Floating>, L8, exticr2),
-    PD5: (pd5, 5, Input<Floating>, L8, exticr2),
-    PD6: (pd6, 6, Input<Floating>, L8, exticr2),
-    PD7: (pd7, 7, Input<Floating>, L8, exticr2),
-    PD8: (pd8, 8, Input<Floating>, H8, exticr3),
-    PD9: (pd9, 9, Input<Floating>, H8, exticr3),
-    PD10: (pd10, 10, Input<Floating>, H8, exticr3),
-    PD11: (pd11, 11, Input<Floating>, H8, exticr3),
-    PD12: (pd12, 12, Input<Floating>, H8, exticr4),
-    PD13: (pd13, 13, Input<Floating>, H8, exticr4),
-    PD14: (pd14, 14, Input<Floating>, H8, exticr4),
-    PD15: (pd15, 15, Input<Floating>, H8, exticr4),
+    PD0: (pd0, 0, Analog, L8, exticr1),
+    PD1: (pd1, 1, Analog, L8, exticr1),
+    PD2: (pd2, 2, Analog, L8, exticr1),
+    PD3: (pd3, 3, Analog, L8, exticr1),
+    PD4: (pd4, 4, Analog, L8, exticr2),
+    PD5: (pd5, 5, Analog, L8, exticr2),
+    PD6: (pd6, 6, Analog, L8, exticr2),
+    PD7: (pd7, 7, Analog, L8, exticr2),
+    PD8: (pd8, 8, Analog, H8, exticr3),
+    PD9: (pd9, 9, Analog, H8, exticr3),
+    PD10: (pd10, 10, Analog, H8, exticr3),
+    PD11: (pd11, 11, Analog, H8, exticr3),
+    PD12: (pd12, 12, Analog, H8, exticr4),
+    PD13: (pd13, 13, Analog, H8, exticr4),
+    PD14: (pd14, 14, Analog, H8, exticr4),
+    PD15: (pd15, 15, Analog, H8, exticr4),
 ]);
 
 gpio!(GPIOE, gpioe, PEx, 'E', 4, [
-    PE0: (pe0, 0, Input<Floating>, L8, exticr1),
-    PE1: (pe1, 1, Input<Floating>, L8, exticr1),
-    PE2: (pe2, 2, Input<Floating>, L8, exticr1),
-    PE3: (pe3, 3, Input<Floating>, L8, exticr1),
-    PE4: (pe4, 4, Input<Floating>, L8, exticr2),
-    PE5: (pe5, 5, Input<Floating>, L8, exticr2),
-    PE6: (pe6, 6, Input<Floating>, L8, exticr2),
-    PE7: (pe7, 7, Input<Floating>, L8, exticr2),
-    PE8: (pe8, 8, Input<Floating>, H8, exticr3),
-    PE9: (pe9, 9, Input<Floating>, H8, exticr3),
-    PE10: (pe10, 10, Input<Floating>, H8, exticr3),
-    PE11: (pe11, 11, Input<Floating>, H8, exticr3),
-    PE12: (pe12, 12, Input<Floating>, H8, exticr4),
-    PE13: (pe13, 13, Input<Floating>, H8, exticr4),
-    PE14: (pe14, 14, Input<Floating>, H8, exticr4),
-    PE15: (pe15, 15, Input<Floating>, H8, exticr4),
+    PE0: (pe0, 0, Analog, L8, exticr1),
+    PE1: (pe1, 1, Analog, L8, exticr1),
+    PE2: (pe2, 2, Analog, L8, exticr1),
+    PE3: (pe3, 3, Analog, L8, exticr1),
+    PE4: (pe4, 4, Analog, L8, exticr2),
+    PE5: (pe5, 5, Analog, L8, exticr2),
+    PE6: (pe6, 6, Analog, L8, exticr2),
+    PE7: (pe7, 7, Analog, L8, exticr2),
+    PE8: (pe8, 8, Analog, H8, exticr3),
+    PE9: (pe9, 9, Analog, H8, exticr3),
+    PE10: (pe10, 10, Analog, H8, exticr3),
+    PE11: (pe11, 11, Analog, H8, exticr3),
+    PE12: (pe12, 12, Analog, H8, exticr4),
+    PE13: (pe13, 13, Analog, H8, exticr4),
+    PE14: (pe14, 14, Analog, H8, exticr4),
+    PE15: (pe15, 15, Analog, H8, exticr4),
 ]);
 
 #[cfg(any(
@@ -727,22 +719,22 @@ gpio!(GPIOE, gpioe, PEx, 'E', 4, [
     feature = "stm32l4s9",
 ))]
 gpio!(GPIOF, gpiof, PFx, 'F', 5, [
-    PF0: (pf0, 0, Input<Floating>, L8, exticr1),
-    PF1: (pf1, 1, Input<Floating>, L8, exticr1),
-    PF2: (pf2, 2, Input<Floating>, L8, exticr1),
-    PF3: (pf3, 3, Input<Floating>, L8, exticr1),
-    PF4: (pf4, 4, Input<Floating>, L8, exticr2),
-    PF5: (pf5, 5, Input<Floating>, L8, exticr2),
-    PF6: (pf6, 6, Input<Floating>, L8, exticr2),
-    PF7: (pf7, 7, Input<Floating>, L8, exticr2),
-    PF8: (pf8, 8, Input<Floating>, H8, exticr3),
-    PF9: (pf9, 9, Input<Floating>, H8, exticr3),
-    PF10: (pf10, 10, Input<Floating>, H8, exticr3),
-    PF11: (pf11, 11, Input<Floating>, H8, exticr3),
-    PF12: (pf12, 12, Input<Floating>, H8, exticr4),
-    PF13: (pf13, 13, Input<Floating>, H8, exticr4),
-    PF14: (pf14, 14, Input<Floating>, H8, exticr4),
-    PF15: (pf15, 15, Input<Floating>, H8, exticr4),
+    PF0: (pf0, 0, Analog, L8, exticr1),
+    PF1: (pf1, 1, Analog, L8, exticr1),
+    PF2: (pf2, 2, Analog, L8, exticr1),
+    PF3: (pf3, 3, Analog, L8, exticr1),
+    PF4: (pf4, 4, Analog, L8, exticr2),
+    PF5: (pf5, 5, Analog, L8, exticr2),
+    PF6: (pf6, 6, Analog, L8, exticr2),
+    PF7: (pf7, 7, Analog, L8, exticr2),
+    PF8: (pf8, 8, Analog, H8, exticr3),
+    PF9: (pf9, 9, Analog, H8, exticr3),
+    PF10: (pf10, 10, Analog, H8, exticr3),
+    PF11: (pf11, 11, Analog, H8, exticr3),
+    PF12: (pf12, 12, Analog, H8, exticr4),
+    PF13: (pf13, 13, Analog, H8, exticr4),
+    PF14: (pf14, 14, Analog, H8, exticr4),
+    PF15: (pf15, 15, Analog, H8, exticr4),
 ]);
 #[cfg(any(
     // feature = "stm32l471",  // missing PAC support for Port G
@@ -762,22 +754,22 @@ gpio!(GPIOF, gpiof, PFx, 'F', 5, [
     feature = "stm32l4s9",
 ))]
 gpio!(GPIOG, gpiog, PGx, 'G', 6, [
-    PG0: (pg0, 0, Input<Floating>, L8, exticr1),
-    PG1: (pg1, 1, Input<Floating>, L8, exticr1),
-    PG2: (pg2, 2, Input<Floating>, L8, exticr1),
-    PG3: (pg3, 3, Input<Floating>, L8, exticr1),
-    PG4: (pg4, 4, Input<Floating>, L8, exticr2),
-    PG5: (pg5, 5, Input<Floating>, L8, exticr2),
-    PG6: (pg6, 6, Input<Floating>, L8, exticr2),
-    PG7: (pg7, 7, Input<Floating>, L8, exticr2),
-    PG8: (pg8, 8, Input<Floating>, H8, exticr3),
-    PG9: (pg9, 9, Input<Floating>, H8, exticr3),
-    PG10: (pg10, 10, Input<Floating>, H8, exticr3),
-    PG11: (pg11, 11, Input<Floating>, H8, exticr3),
-    PG12: (pg12, 12, Input<Floating>, H8, exticr4),
-    PG13: (pg13, 13, Input<Floating>, H8, exticr4),
-    PG14: (pg14, 14, Input<Floating>, H8, exticr4),
-    PG15: (pg15, 15, Input<Floating>, H8, exticr4),
+    PG0: (pg0, 0, Analog, L8, exticr1),
+    PG1: (pg1, 1, Analog, L8, exticr1),
+    PG2: (pg2, 2, Analog, L8, exticr1),
+    PG3: (pg3, 3, Analog, L8, exticr1),
+    PG4: (pg4, 4, Analog, L8, exticr2),
+    PG5: (pg5, 5, Analog, L8, exticr2),
+    PG6: (pg6, 6, Analog, L8, exticr2),
+    PG7: (pg7, 7, Analog, L8, exticr2),
+    PG8: (pg8, 8, Analog, H8, exticr3),
+    PG9: (pg9, 9, Analog, H8, exticr3),
+    PG10: (pg10, 10, Analog, H8, exticr3),
+    PG11: (pg11, 11, Analog, H8, exticr3),
+    PG12: (pg12, 12, Analog, H8, exticr4),
+    PG13: (pg13, 13, Analog, H8, exticr4),
+    PG14: (pg14, 14, Analog, H8, exticr4),
+    PG15: (pg15, 15, Analog, H8, exticr4),
 ]);
 
 struct Gpio<const P: char>;