Skip to content

Commit 587dbad

Browse files
burrbullburrbull
committed
beautify
1 parent 36aecc8 commit 587dbad

File tree

5 files changed

+65
-65
lines changed

5 files changed

+65
-65
lines changed

‎src/can.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ pub mod can1 {
4646

4747
remap! {
4848
pac::CAN1: [
49-
PA12, PA11 => 0;
50-
PB9, PB8 => 2;
49+
Tx: PA12, Rx: PA11 => 0;
50+
Tx: PB9, Rx: PB8 => 2;
5151
]
5252
}
5353
}
@@ -58,14 +58,14 @@ pub mod can2 {
5858

5959
remap! {
6060
pac::CAN2: [
61-
PB6, PB5 => 0;
62-
PB13, PB12 => 1;
61+
Tx: PB6, Rx: PB5 => 0;
62+
Tx: PB13, Rx: PB12 => 1;
6363
]
6464
}
6565
}
6666

6767
macro_rules! remap {
68-
($PER:ty: [$($TX:ident, $RX:ident => $remap:literal;)+]) => {
68+
($PER:ty: [$(Tx: $TX:ident, Rx: $RX:ident => $remap:literal;)+]) => {
6969
pub enum Tx {
7070
$(
7171
$TX(gpio::$TX<Alternate>),

‎src/i2c.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ pub mod i2c1 {
105105

106106
remap! {
107107
pac::I2C1: [
108-
PB6, PB7 => MAPR: 0;
109-
PB8, PB9 => MAPR: 1;
108+
Scl: PB6, Sda: PB7 => MAPR: 0;
109+
Scl: PB8, Sda: PB9 => MAPR: 1;
110110
]
111111
}
112112
}
@@ -115,14 +115,14 @@ pub mod i2c2 {
115115

116116
remap! {
117117
pac::I2C2: [
118-
PB10, PB11;
118+
Scl: PB10, Sda: PB11;
119119
]
120120
}
121121
}
122122

123123
macro_rules! remap {
124124
($PER:ty: [
125-
$($SCL:ident, $SDA:ident $( => $MAPR:ident: $remap:literal)?;)+
125+
$(Scl: $SCL:ident, Sda: $SDA:ident $( => $MAPR:ident: $remap:literal)?;)+
126126
]) => {
127127
pub enum Scl {
128128
$(

‎src/serial.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ pub mod usart1 {
101101

102102
remap! {
103103
pac::USART1: [
104-
PA9, PA10 => 0;
105-
PB6, PB7 => 1;
104+
Tx: PA9, Rx: PA10 => 0;
105+
Tx: PB6, Rx: PB7 => 1;
106106
]
107107
}
108108
}
@@ -112,8 +112,8 @@ pub mod usart2 {
112112

113113
remap! {
114114
pac::USART2: [
115-
PA2, PA3 => 0;
116-
PD5, PD6 => 1;
115+
Tx: PA2, Rx: PA3 => 0;
116+
Tx: PD5, Rx: PD6 => 1;
117117
]
118118
}
119119
}
@@ -123,15 +123,15 @@ pub mod usart3 {
123123

124124
remap! {
125125
pac::USART3: [
126-
PB10, PB11 => 0;
127-
PC10, PC11 => 1;
128-
PD8, PD9 => 3;
126+
Tx: PB10, Rx: PB11 => 0;
127+
Tx: PC10, Rx: PC11 => 1;
128+
Tx: PD8, Rx: PD9 => 3;
129129
]
130130
}
131131
}
132132

133133
macro_rules! remap {
134-
($PER:ty: [$($TX:ident, $RX:ident => $remap:literal;)+]) => {
134+
($PER:ty: [$(Tx: $TX:ident, Rx: $RX:ident => $remap:literal;)+]) => {
135135
pub enum Tx<Otype> {
136136
$(
137137
$TX(gpio::$TX<Alternate<Otype>>),

‎src/spi.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ pub mod spi1 {
124124

125125
remap! {
126126
pac::SPI1: [
127-
PA5, PA6, PA7 => MAPR: 0;
128-
PB3, PB4, PB5 => MAPR: 1;
127+
Sck: PA5, Miso: PA6, Mosi: PA7 => MAPR: 0;
128+
Sck: PB3, Miso: PB4, Mosi: PB5 => MAPR: 1;
129129
]
130130
}
131131
}
@@ -135,7 +135,7 @@ pub mod spi2 {
135135

136136
remap! {
137137
pac::SPI2: [
138-
PB13, PB14, PB15;
138+
Sck: PB13, Miso: PB14, Mosi: PB15;
139139
]
140140
}
141141
}
@@ -146,21 +146,21 @@ pub mod spi3 {
146146
#[cfg(not(feature = "connectivity"))]
147147
remap! {
148148
pac::SPI3: [
149-
PB3, PB4, PB5;
149+
Sck: PB3, Miso: PB4, Mosi: PB5;
150150
]
151151
}
152152
#[cfg(feature = "connectivity")]
153153
remap! {
154154
pac::SPI3: [
155-
PB3, PB4, PB5 => MAPR: 0;
156-
PC10, PC11, PC12 => MAPR: 1;
155+
Sck: PB3, Miso: PB4, Mosi: PB5 => MAPR: 0;
156+
Sck: PC10, Miso: PC11, Mosi: PC12 => MAPR: 1;
157157
]
158158
}
159159
}
160160

161161
macro_rules! remap {
162162
($PER:ty: [
163-
$($SCK:ident, $MISO:ident, $MOSI:ident $( => $MAPR:ident: $remap:literal)?;)+
163+
$(Sck: $SCK:ident, Miso: $MISO:ident, Mosi: $MOSI:ident $( => $MAPR:ident: $remap:literal)?;)+
164164
]) => {
165165
pub enum Sck {
166166
$(

‎src/timer/pins.rs

+41-41
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,26 @@ pub mod tim1 {
6969

7070
remap4! {
7171
pac::TIM1: [
72-
PA8, PA9, PA10, PA11 => MAPR: 0;
73-
PE9, PE11, PE13, PE14 => MAPR: 3;
72+
C1: PA8, C2: PA9, C3: PA10, C4: PA11 => MAPR: 0;
73+
C1: PE9, C2: PE11, C3: PE13, C4: PE14 => MAPR: 3;
7474
]
7575
}
7676
remap12! {
7777
pac::TIM1: [
78-
PA8, PA9 => MAPR: 0;
79-
PE9, PE11 => MAPR: 3;
78+
C1: PA8, C2: PA9 => MAPR: 0;
79+
C1: PE9, C2: PE11 => MAPR: 3;
8080
]
8181
}
8282
remap_input! {
8383
pac::TIM1: [
84-
PA8, PA9 => MAPR: 0;
85-
PE9, PE11 => MAPR: 3;
84+
C1: PA8, C2: PA9 => MAPR: 0;
85+
C1: PE9, C2: PE11 => MAPR: 3;
8686
]
8787
}
8888
remap34! {
8989
pac::TIM1: [
90-
PA10, PA11 => MAPR: 0;
91-
PE13, PE14 => MAPR: 3;
90+
C3: PA10, C4: PA11 => MAPR: 0;
91+
C3: PE13, C4: PE14 => MAPR: 3;
9292
]
9393
}
9494

@@ -109,28 +109,28 @@ pub mod tim2 {
109109

110110
remap4! {
111111
pac::TIM2: [
112-
PA0, PA1, PA2, PA3 => MAPR: 0;
113-
PA15, PB3, PA2, PA3 => MAPR: 1;
114-
PA0, PA1, PB10, PB11 => MAPR: 2;
115-
PA15, PB3, PB10, PB11 => MAPR: 3;
112+
C1: PA0, C2: PA1, C3: PA2, C4: PA3 => MAPR: 0;
113+
C1: PA15, C2: PB3, C3: PA2, C4: PA3 => MAPR: 1;
114+
C1: PA0, C2: PA1, C3: PB10, C4: PB11 => MAPR: 2;
115+
C1: PA15, C2: PB3, C3: PB10, C4: PB11 => MAPR: 3;
116116
]
117117
}
118118
remap12! {
119119
pac::TIM2: [
120-
PA0, PA1 => MAPR: 0;
121-
PA15, PB3 => MAPR: 1;
120+
C1: PA0, C2: PA1 => MAPR: 0;
121+
C1: PA15, C2: PB3 => MAPR: 1;
122122
]
123123
}
124124
remap_input! {
125125
pac::TIM2: [
126-
PA0, PA1 => MAPR: 0;
127-
PA15, PB3 => MAPR: 1;
126+
C1: PA0, C2: PA1 => MAPR: 0;
127+
C1: PA15, C2: PB3 => MAPR: 1;
128128
]
129129
}
130130
remap34! {
131131
pac::TIM2: [
132-
PA2, PA3 => MAPR: 0;
133-
PB10, PB11 => MAPR: 2;
132+
C3: PA2, C4: PA3 => MAPR: 0;
133+
C3: PB10, C4: PB11 => MAPR: 2;
134134
]
135135
}
136136

@@ -151,29 +151,29 @@ pub mod tim3 {
151151

152152
remap4! {
153153
pac::TIM3: [
154-
PA6, PA7, PB0, PB1 => MAPR: 0;
155-
PB4, PB5, PB0, PB1 => MAPR: 2;
156-
PC6, PC7, PC8, PC9 => MAPR: 3;
154+
C1: PA6, C2: PA7, C3: PB0, C4: PB1 => MAPR: 0;
155+
C1: PB4, C2: PB5, C3: PB0, C4: PB1 => MAPR: 2;
156+
C1: PC6, C2: PC7, C3: PC8, C4: PC9 => MAPR: 3;
157157
]
158158
}
159159
remap12! {
160160
pac::TIM3: [
161-
PA6, PA7 => MAPR: 0;
162-
PB4, PB5 => MAPR: 2;
163-
PC6, PC7 => MAPR: 3;
161+
C1: PA6, C2: PA7 => MAPR: 0;
162+
C1: PB4, C2: PB5 => MAPR: 2;
163+
C1: PC6, C2: PC7 => MAPR: 3;
164164
]
165165
}
166166
remap_input! {
167167
pac::TIM3: [
168-
PA6, PA7 => MAPR: 0;
169-
PB4, PB5 => MAPR: 2;
170-
PC6, PC7 => MAPR: 3;
168+
C1: PA6, C2: PA7 => MAPR: 0;
169+
C1: PB4, C2: PB5 => MAPR: 2;
170+
C1: PC6, C2: PC7 => MAPR: 3;
171171
]
172172
}
173173
remap34! {
174174
pac::TIM3: [
175-
PB0, PB1 => MAPR: 0;
176-
PC8, PC9 => MAPR: 3;
175+
C3: PB0, C4: PB1 => MAPR: 0;
176+
C3: PC8, C4: PC9 => MAPR: 3;
177177
]
178178
}
179179

@@ -195,26 +195,26 @@ pub mod tim4 {
195195

196196
remap4! {
197197
pac::TIM4: [
198-
PB6, PB7, PB8, PB9 => MAPR: 0;
199-
PD12, PD13, PD14, PD15 => MAPR: 1;
198+
C1: PB6, C2: PB7, C3: PB8, C4: PB9 => MAPR: 0;
199+
C1: PD12, C2: PD13, C3: PD14, C4: PD15 => MAPR: 1;
200200
]
201201
}
202202
remap12! {
203203
pac::TIM4: [
204-
PB6, PB7 => MAPR: 0;
205-
PD12, PD13 => MAPR: 1;
204+
C1: PB6, C2: PB7 => MAPR: 0;
205+
C1: PD12, C2: PD13 => MAPR: 1;
206206
]
207207
}
208208
remap_input! {
209209
pac::TIM4: [
210-
PB6, PB7 => MAPR: 0;
211-
PD12, PD13 => MAPR: 1;
210+
C1: PB6, C2: PB7 => MAPR: 0;
211+
C1: PD12, C2: PD13 => MAPR: 1;
212212
]
213213
}
214214
remap34! {
215215
pac::TIM4: [
216-
PB8, PB9 => MAPR: 0;
217-
PD14, PD15 => MAPR: 1;
216+
C3: PB8, C4: PB9 => MAPR: 0;
217+
C3: PD14, C4: PD15 => MAPR: 1;
218218
]
219219
}
220220

@@ -257,7 +257,7 @@ use in_enums;
257257

258258
macro_rules! remap4 {
259259
($TIM:ty: [
260-
$($P1:ident, $P2:ident, $P3:ident, $P4:ident $( => $MAPR:ident: $remap:literal)?;)+
260+
$(C1: $P1:ident, C2: $P2:ident, C3: $P3:ident, C4: $P4:ident $( => $MAPR:ident: $remap:literal)?;)+
261261
]) => {
262262
pub type Channels1234 = Pins4<Ch1, Ch2, Ch3, Ch4>;
263263
remap_combo! {
@@ -319,7 +319,7 @@ use remap4;
319319

320320
macro_rules! remap12 {
321321
($TIM:ty: [
322-
$($P1:ident, $P2:ident $( => $MAPR:ident: $remap:literal)?;)+
322+
$(C1: $P1:ident, C2: $P2:ident $( => $MAPR:ident: $remap:literal)?;)+
323323
]) => {
324324
pub type Channels12 = Pins2<Ch1, Ch2>;
325325
remap_combo! {
@@ -343,7 +343,7 @@ use remap12;
343343

344344
macro_rules! remap34 {
345345
($TIM:ty: [
346-
$($P1:ident, $P2:ident $( => $MAPR:ident: $remap:literal)?;)+
346+
$(C3: $P1:ident, C4: $P2:ident $( => $MAPR:ident: $remap:literal)?;)+
347347
]) => {
348348
pub type Channels34 = Pins2<Ch3, Ch4>;
349349
remap_combo! {
@@ -492,7 +492,7 @@ pub trait Pins<TIM> {
492492

493493
macro_rules! remap_input {
494494
($TIM:ty: [
495-
$($P0:ident, $P1:ident $( => $MAPR:ident: $remap:literal)?;)+
495+
$(C1: $P0:ident, C2: $P1:ident $( => $MAPR:ident: $remap:literal)?;)+
496496
]) => {
497497
impl InputPins for $TIM {
498498
type InCh1 = InCh1;

0 commit comments

Comments
 (0)