Skip to content

Commit e3d7111

Browse files
committed
Fix some long-standing errors and inconsistencies for USARTS
1 parent 32b14bf commit e3d7111

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

src/serial.rs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -116,18 +116,23 @@ macro_rules! usart_pins {
116116

117117
#[cfg(any(
118118
feature = "stm32f030",
119+
feature = "stm32f031",
120+
feature = "stm32f038",
119121
feature = "stm32f042",
120122
feature = "stm32f048",
121123
feature = "stm32f051",
122124
feature = "stm32f058",
125+
feature = "stm32f070",
123126
feature = "stm32f071",
127+
feature = "stm32f072",
124128
feature = "stm32f078",
129+
feature = "stm32f091",
125130
feature = "stm32f098",
126131
))]
127132
usart_pins! {
128-
USART1 => {
133+
USART1 => {
129134
tx => [gpioa::PA9<Alternate<AF1>>, gpiob::PB6<Alternate<AF0>>],
130-
rx => [gpioa::PA10<Alternate<AF1>>, gpiob::PB6<Alternate<AF0>>],
135+
rx => [gpioa::PA10<Alternate<AF1>>, gpiob::PB7<Alternate<AF0>>],
131136
}
132137
}
133138
#[cfg(any(feature = "stm32f030x6", feature = "stm32f031", feature = "stm32f038"))]
@@ -137,19 +142,6 @@ usart_pins! {
137142
rx => [gpioa::PA3<Alternate<AF1>>, gpioa::PA15<Alternate<AF1>>],
138143
}
139144
}
140-
#[cfg(any(
141-
feature = "stm32f031",
142-
feature = "stm32f038",
143-
feature = "stm32f070",
144-
feature = "stm32f072",
145-
feature = "stm32f091",
146-
))]
147-
usart_pins! {
148-
USART1 => {
149-
tx => [gpioa::PA9<Alternate<AF1>>, gpiob::PB6<Alternate<AF0>>],
150-
rx => [gpioa::PA10<Alternate<AF1>>, gpiob::PB7<Alternate<AF0>>],
151-
}
152-
}
153145

154146
#[cfg(any(
155147
feature = "stm32f030x8",

0 commit comments

Comments
 (0)