aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple/timers.c
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@mit.edu>2010-10-14 23:31:33 -0400
committerMarti Bolivar <mbolivar@mit.edu>2010-10-14 23:31:33 -0400
commit8bcd7de4fff752f173a253026e6c671bdad03505 (patch)
tree61adef4ade428dec8597ed9dc48d1591532bda04 /libmaple/timers.c
parentd8ec48c9312d87d8c358e32550f950fa851c0599 (diff)
parentaa7a43efce35fa41d57f9858ee41be0c33e84709 (diff)
downloadlibrambutan-8bcd7de4fff752f173a253026e6c671bdad03505.tar.gz
librambutan-8bcd7de4fff752f173a253026e6c671bdad03505.zip
Merge branch 'master' of github.com:leaflabs/libmaple
Diffstat (limited to 'libmaple/timers.c')
-rw-r--r--libmaple/timers.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libmaple/timers.c b/libmaple/timers.c
index 5b97e20..334ec0b 100644
--- a/libmaple/timers.c
+++ b/libmaple/timers.c
@@ -103,19 +103,15 @@ void timer_init(uint8 timer_num, uint16 prescale) {
* we'll worry about that later. */
timer->CCR1 = 0x8FFF; // PWM start value
timer->CCMR1 |= 0x68; // PWM mode 1, enable preload register.
- timer->CCER |= 0x001; // enable ch
timer->CCR2 = 0x8FFF; // PWM start value
timer->CCMR1 |= (0x68 << 8);// PWM mode 1, enable preload register.
- timer->CCER |= 0x010; // enable ch
timer->CCR3 = 0x8FFF; // PWM start value
timer->CCMR2 |= 0x68; // PWM mode 1, enable preload register.
- timer->CCER |= 0x100; // enable ch
timer->CCR4 = 0x8FFF; // PWM start value
timer->CCMR2 |= (0x68 << 8);// PWM mode 1, enable preload register.
- timer->CCER |= 0x1000; // enable ch
/* Advanced timer? */
if (is_advanced) {