Skip to content

Commit 98e37d9

Browse files
gbiptherealprof
authored andcommitted
Fix gpio configuration for pwm input (#56)
* Fix pin input mode for pwm_input * Fix example according to the new API
1 parent 66cfb78 commit 98e37d9

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

examples/pwm_input.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ fn main() -> ! {
2727

2828
let mut gpiob = p.GPIOB.split(&mut rcc.apb2);
2929

30-
let pb4 = gpiob.pb4.into_alternate_open_drain(&mut gpiob.crl);
31-
let pb5 = gpiob.pb5.into_alternate_open_drain(&mut gpiob.crl);
30+
let pb4 = gpiob.pb4;
31+
let pb5 = gpiob.pb5;
3232

3333
let pwm_input = p.TIM3.pwm_input(
3434
(pb4, pb5),

src/pwm_input.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::stm32::{DBGMCU as DBG, TIM1, TIM2, TIM3, TIM4};
99
use crate::afio::MAPR;
1010
use crate::gpio::gpioa::{PA0, PA1, PA15, PA6, PA7, PA8, PA9};
1111
use crate::gpio::gpiob::{PB3, PB4, PB5, PB6, PB7};
12-
use crate::gpio::{Alternate, OpenDrain};
12+
use crate::gpio::{Floating, Input};
1313
use crate::rcc::{Clocks, APB1};
1414
use crate::time::Hertz;
1515
use crate::timer::PclkSrc;
@@ -18,27 +18,27 @@ pub trait Pins<TIM> {
1818
const REMAP: u8;
1919
}
2020

21-
impl Pins<TIM4> for (PB6<Alternate<OpenDrain>>, PB7<Alternate<OpenDrain>>) {
21+
impl Pins<TIM4> for (PB6<Input<Floating>>, PB7<Input<Floating>>) {
2222
const REMAP: u8 = 0b0;
2323
}
2424

25-
impl Pins<TIM3> for (PA6<Alternate<OpenDrain>>, PA7<Alternate<OpenDrain>>) {
25+
impl Pins<TIM3> for (PA6<Input<Floating>>, PA7<Input<Floating>>) {
2626
const REMAP: u8 = 0b00;
2727
}
2828

29-
impl Pins<TIM3> for (PB4<Alternate<OpenDrain>>, PB5<Alternate<OpenDrain>>) {
29+
impl Pins<TIM3> for (PB4<Input<Floating>>, PB5<Input<Floating>>) {
3030
const REMAP: u8 = 0b10;
3131
}
3232

33-
impl Pins<TIM2> for (PA0<Alternate<OpenDrain>>, PA1<Alternate<OpenDrain>>) {
33+
impl Pins<TIM2> for (PA0<Input<Floating>>, PA1<Input<Floating>>) {
3434
const REMAP: u8 = 0b00;
3535
}
3636

37-
impl Pins<TIM2> for (PA15<Alternate<OpenDrain>>, PB3<Alternate<OpenDrain>>) {
37+
impl Pins<TIM2> for (PA15<Input<Floating>>, PB3<Input<Floating>>) {
3838
const REMAP: u8 = 0b11;
3939
}
4040

41-
impl Pins<TIM1> for (PA8<Alternate<OpenDrain>>, PA9<Alternate<OpenDrain>>) {
41+
impl Pins<TIM1> for (PA8<Input<Floating>>, PA9<Input<Floating>>) {
4242
const REMAP: u8 = 0b00;
4343
}
4444

0 commit comments

Comments
 (0)