Skip to content

Commit 2e33975

Browse files
committed
pwm: Fix enable for other channels than 1
1 parent 6a9f41d commit 2e33975

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/pwm.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,18 @@ macro_rules! brk {
7676
}
7777

7878
macro_rules! pwm_pin {
79-
($TIMX:ty, $C:ty, $ccr: ident, $bit:literal) => {
79+
($TIMX:ty, $C:ty, $ccr: ident, $cce: ident) => {
8080
impl PwmChannel<$TIMX, $C> {
8181
#[inline]
8282
pub fn disable(&mut self) {
8383
//NOTE(unsafe) atomic write with no side effects
84-
unsafe { (*<$TIMX>::ptr()).ccer.modify(|_, w| w.cc1e().clear_bit()) };
84+
unsafe { (*<$TIMX>::ptr()).ccer.modify(|_, w| w.$cce().clear_bit()) };
8585
}
8686

8787
#[inline]
8888
pub fn enable(&mut self) {
8989
//NOTE(unsafe) atomic write with no side effects
90-
unsafe { (*<$TIMX>::ptr()).ccer.modify(|_, w| w.cc1e().set_bit()) };
90+
unsafe { (*<$TIMX>::ptr()).ccer.modify(|_, w| w.$cce().set_bit()) };
9191
}
9292

9393
#[inline]
@@ -187,10 +187,10 @@ macro_rules! pwm_all_channels {
187187
}
188188
}
189189

190-
pwm_pin!(crate::pac::$TIMX, C1, ccr1, 0);
191-
pwm_pin!(crate::pac::$TIMX, C2, ccr2, 4);
192-
pwm_pin!(crate::pac::$TIMX, C3, ccr3, 8);
193-
pwm_pin!(crate::pac::$TIMX, C4, ccr4, 12);
190+
pwm_pin!(crate::pac::$TIMX, C1, ccr1, cc1e);
191+
pwm_pin!(crate::pac::$TIMX, C2, ccr2, cc2e);
192+
pwm_pin!(crate::pac::$TIMX, C3, ccr3, cc3e);
193+
pwm_pin!(crate::pac::$TIMX, C4, ccr4, cc4e);
194194
)+
195195
};
196196
}
@@ -236,8 +236,8 @@ macro_rules! pwm_2_channels {
236236
}
237237
}
238238

239-
pwm_pin!(crate::pac::$TIMX, C1, ccr1, 0);
240-
pwm_pin!(crate::pac::$TIMX, C2, ccr2, 4);
239+
pwm_pin!(crate::pac::$TIMX, C1, ccr1, cc1e);
240+
pwm_pin!(crate::pac::$TIMX, C2, ccr2, cc2e);
241241
)+
242242
};
243243
}
@@ -278,7 +278,7 @@ macro_rules! pwm_1_channel {
278278
}
279279
}
280280

281-
pwm_pin!(crate::pac::$TIMX, C1, ccr1, 0);
281+
pwm_pin!(crate::pac::$TIMX, C1, ccr1, cc1e);
282282
)+
283283
};
284284
}

0 commit comments

Comments
 (0)