Skip to content

Commit 3258be6

Browse files
resorted pin => channel mapping
1 parent 5e86d48 commit 3258be6

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/adc.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,12 @@ adc_pins!(ADC2,
196196
gpioa::PA6<Analog> => 3,
197197
gpioa::PA7<Analog> => 4,
198198
gpioc::PC4<Analog> => 5,
199-
gpioc::PC5<Analog> => 11,
200-
gpiob::PB2<Analog> => 12,
201199
gpioc::PC0<Analog> => 6,
202200
gpioc::PC1<Analog> => 7,
203201
gpioc::PC2<Analog> => 8,
204202
gpioc::PC3<Analog> => 9,
203+
gpioc::PC5<Analog> => 11,
204+
gpiob::PB2<Analog> => 12,
205205
);
206206

207207
#[cfg(any(feature = "stm32f303x6", feature = "stm32f303x8"))]
@@ -234,19 +234,19 @@ adc_pins!(ADC3,
234234
gpiob::PB1<Analog> => 1,
235235
gpioe::PE9<Analog> => 2,
236236
gpioe::PE13<Analog> => 3,
237+
// There is no ADC3 Channel #4
237238
gpiob::PB13<Analog> => 5,
238-
gpiob::PB0<Analog> => 12,
239-
gpioe::PE7<Analog> => 13,
240-
gpioe::PE10<Analog> => 14,
241-
gpioe::PE11<Analog> => 15,
242-
gpioe::PE12<Analog> => 16,
243-
// Shared channels (i.e. ADC34_INx)
244239
gpioe::PE8<Analog> => 6,
245240
gpiod::PD10<Analog> => 7,
246241
gpiod::PD11<Analog> => 8,
247242
gpiod::PD12<Analog> => 9,
248243
gpiod::PD13<Analog> => 10,
249244
gpiod::PD14<Analog> => 11,
245+
gpiob::PB0<Analog> => 12,
246+
gpioe::PE7<Analog> => 13,
247+
gpioe::PE10<Analog> => 14,
248+
gpioe::PE11<Analog> => 15,
249+
gpioe::PE12<Analog> => 16,
250250
);
251251

252252
// # ADC4 Pin/Channel mapping
@@ -264,15 +264,14 @@ adc_pins!(ADC4,
264264
gpiob::PB12<Analog> => 3,
265265
gpiob::PB14<Analog> => 4,
266266
gpiob::PB15<Analog> => 5,
267-
gpiob::PB8<Analog> => 12,
268-
gpiob::PB9<Analog> => 13,
269-
// Shared channels (i.e. ADC34_INx)
270267
gpioe::PE8<Analog> => 6,
271268
gpiod::PD10<Analog> => 7,
272269
gpiod::PD11<Analog> => 8,
273270
gpiod::PD12<Analog> => 9,
274271
gpiod::PD13<Analog> => 10,
275272
gpiod::PD14<Analog> => 11,
273+
gpiob::PD8<Analog> => 12,
274+
gpiob::PD9<Analog> => 13,
276275
);
277276

278277
// Abstract implementation of ADC functionality

0 commit comments

Comments
 (0)