@@ -7,7 +7,7 @@ use crate::hal;
7
7
use crate :: stm32:: { TIM1 , TIM15 , TIM2 } ;
8
8
9
9
use crate :: gpio:: gpioa:: { PA0 , PA1 , PA10 , PA11 , PA15 , PA2 , PA3 , PA8 , PA9 } ;
10
- use crate :: gpio:: gpiob:: { PB10 , PB11 , PB14 , PB3 } ;
10
+ use crate :: gpio:: gpiob:: { PB10 , PB11 , PB14 , PB15 , PB3 } ;
11
11
use crate :: gpio:: Alternate ;
12
12
use crate :: rcc:: { Clocks , Enable , Reset , APB1R1 , APB2 } ;
13
13
use crate :: time:: Hertz ;
@@ -92,15 +92,14 @@ pins_to_channels_mapping! {
92
92
TIM2 : ( PB10 ) , ( C3 ) , ( 1 ) ;
93
93
TIM2 : ( PB11 ) , ( C4 ) , ( 1 ) ;
94
94
95
- // TIM15 - TODO: The uncommented lines are awaiting PAC updates to be valid.
96
95
TIM15 : ( PB14 ) , ( C1 ) , ( 14 ) ;
97
- // TIM15: (PB15), (C2), (14);
96
+ TIM15 : ( PB15 ) , ( C2 ) , ( 14 ) ;
98
97
TIM15 : ( PA2 ) , ( C1 ) , ( 14 ) ;
99
- // TIM15: (PA3), (C2), (14);
100
- // TIM15: (PB14, PB15), (C1, C2), (14, 14);
101
- // TIM15: (PB14, PA3), (C1, C2), (14, 14);
102
- // TIM15: (PA2, PB15), (C1, C2), (14, 14);
103
- // TIM15: (PA2, PA3), (C1, C2), (14, 14);
98
+ TIM15 : ( PA3 ) , ( C2 ) , ( 14 ) ;
99
+ TIM15 : ( PB14 , PB15 ) , ( C1 , C2 ) , ( 14 , 14 ) ;
100
+ TIM15 : ( PB14 , PA3 ) , ( C1 , C2 ) , ( 14 , 14 ) ;
101
+ TIM15 : ( PA2 , PB15 ) , ( C1 , C2 ) , ( 14 , 14 ) ;
102
+ TIM15 : ( PA2 , PA3 ) , ( C1 , C2 ) , ( 14 , 14 ) ;
104
103
}
105
104
106
105
pub trait PwmExt1 : Sized {
@@ -316,10 +315,9 @@ macro_rules! small_timer {
316
315
tim. ccmr1_output( ) . modify( |_, w| w. oc1pe( ) . set_bit( ) . oc1m( ) . bits( 6 ) ) ;
317
316
}
318
317
319
- // TODO: The uncommented lines are awaiting PAC updates to be valid.
320
- // if PINS::C2 {
321
- // tim.ccmr1_output().modify(|_, w| w.oc2pe().set_bit().oc2m().bits(6));
322
- // }
318
+ if PINS :: C2 {
319
+ tim. ccmr1_output( ) . modify( |_, w| w. oc2pe( ) . set_bit( ) . oc2m( ) . bits( 6 ) ) ;
320
+ }
323
321
324
322
let clk = clocks. pclk1( ) ;
325
323
let ticks = clk / freq;
@@ -344,8 +342,7 @@ macro_rules! small_timer {
344
342
345
343
pwm_channels! {
346
344
$TIMX: ( C1 , $arr_width, cc1e, ccr1, ccr) ,
347
- // TODO: The uncommented line is awaiting PAC updates to be valid.
348
- // (C2, $arr_width, cc2e, ccr2, ccr2),
345
+ ( C2 , $arr_width, cc2e, ccr2, ccr2) ,
349
346
}
350
347
351
348
) +
0 commit comments