commit ffeef3fa8cb764949ae51e6f08c84f25a95691e3
author Brian Silverman <brians> Sun Dec 22 14:06:23 2013 -0800
committer Brian Silverman <brians> Sun Dec 22 14:06:23 2013 -0800
tree 20797945a4d42f030d7abd552d037e828a8574f5
parent dd90147b4650fe18542bf3ce3324b4ef8a4efb27

fixed style issues + got encoders and timestamp actually working

bbb_cape/src/cape/analog.c

diff --git a/bbb_cape/src/cape/analog.c b/bbb_cape/src/cape/analog.c
index 14c45a1..7345916 100644
--- a/bbb_cape/src/cape/analog.c
+++ b/bbb_cape/src/cape/analog.c
@@ -46,7 +46,7 @@
     analog_readings[current_channel] = value & 0x3FF;
     CSEL_GPIO->BSRRH = 1 << CSEL_NUM;
 
-    TIM->CR1 = TIM_CR1_UDIS | TIM_CR1_OPM;
+    TIM->CR1 = TIM_CR1_OPM;
     TIM->EGR = TIM_EGR_UG;
     TIM->CR1 |= TIM_CR1_CEN;
   }
@@ -76,7 +76,7 @@
   NVIC_SetPriority(TIM_IRQn, 6);
   NVIC_EnableIRQ(TIM_IRQn);
 
-  TIM->CR1 = TIM_CR1_UDIS | TIM_CR1_OPM;
+  TIM->CR1 = TIM_CR1_OPM;
   TIM->DIER = TIM_DIER_CC1IE;
   TIM->CCMR1 = 0;
   // Make each tick take 500ns.