Merge branch 'master' of ssh://anxur.fi.muni.cz/~kas/html/git/tinyboard

[tinyboard.git] / projects / step-up / adc.c

diff --git a/projects/step-up/adc.c b/projects/step-up/adc.c
index d7679d30b09cff20d7038629cca4d334b8a04b06..fc4c7caac3a201b3526c2f5a4908aabc24c5f67b 100644 (file)
--- a/projects/step-up/adc.c
+++ b/projects/step-up/adc.c
@@ -1,5 +1,6 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
+#include <avr/power.h>
 #include <avr/sleep.h>
 
 #include "lights.h"
@@ -105,6 +106,9 @@ void init_adc()
        current_slow_adc = NUM_ADCS;
        current_adc = 0;
 
+       power_adc_enable();
+       ACSR |= _BV(ACD);       // but disable the analog comparator
+
        ADCSRA = _BV(ADEN)                      // enable
                | _BV(ADPS1) | _BV(ADPS0)       // CLK/8 = 125 kHz
                // | _BV(ADPS2)                 // CLK/16 = 62.5 kHz
@@ -140,9 +144,21 @@ static void adc1_gain20_adc(uint16_t adcsum)
 }
 #endif
 
+static void inline adc_based_timer()
+{
+       static uint16_t pattern_counter;
+
+       if (++pattern_counter > 250) {
+               pattern_counter = 0;
+               patterns_next_tick();
+       }
+}
+
 ISR(ADC_vect) { // IRQ handler
        uint16_t adcval = ADCW;
 
+       adc_based_timer();
+
        if (read_zero) {
                setup_mux(current_adc);
                read_zero = 0;