Diff: main.cpp

Revision:

30:2b6d426f3bfc

Parent:

29:cb03760ba9ea

Child:

31:86b87913d8e1

--- a/main.cpp	Sat Mar 14 23:42:46 2015 +0000
+++ b/main.cpp	Sun Mar 15 01:45:22 2015 +0000
@@ -7,23 +7,23 @@
 #include "sensors.h"
 #include "callbacks.h"
 
-unsigned short global_ib, global_ic;
-unsigned char channel_ib, channel_ic;
+volatile unsigned short global_ib, global_ic;
+uint32_t channel_ib, channel_ic;
 
 extern "C" void TIM2_Derpy_Handler()
 {
     TIM2->SR &= ~1;
-
-    TIM2->DIER = 0x0000;
-    ADC1->SQR3 = channel_ib;
+    ADC1->SQR1 &= ~ADC_SQR1_L;
+    ADC1->SQR3 = 0;
+    ADC1->SQR3 |= channel_ib;
     ADC1->CR2 |= ADC_CR2_SWSTART;
     while ((ADC1->SR & 2) == 0){}
     global_ib = ADC1->DR;
     
-    ADC1->SQR3 = channel_ic;
+    ADC1->SQR3 = 0;
+    ADC1->SQR3 |= channel_ic;
     ADC1->CR2 |= ADC_CR2_SWSTART;
     while ((ADC1->SR & 2) == 0){}
-    TIM2->DIER = 0x0001;
     global_ic = ADC1->DR;
 }