From 907fb78d62535f7699684d27907f98c1e2e31251 Mon Sep 17 00:00:00 2001 From: hg Date: Sat, 21 Feb 2015 23:47:37 +0100 Subject: [PATCH] fix --- src/adc.cpp | 1 + src/adc.h | 2 +- src/pwm.cpp | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/adc.cpp b/src/adc.cpp index 3b6cfb5..af10327 100644 --- a/src/adc.cpp +++ b/src/adc.cpp @@ -33,6 +33,7 @@ uint16_t adcGet() { if ((ADC10CTL0 & ADC10IFG) != 0) { res = ADC10MEM; + res >>= 1; ADC10CTL0 &= ~(ADC10IFG | ENC); break; } diff --git a/src/adc.h b/src/adc.h index 1613fd8..53ce17d 100644 --- a/src/adc.h +++ b/src/adc.h @@ -12,7 +12,7 @@ const uint32_t ADC_TIME_OUT = 100000; -const uint16_t ADC_MAX = 1023; +const uint16_t ADC_MAX = 511; void adcInit(); uint16_t adcGet(); diff --git a/src/pwm.cpp b/src/pwm.cpp index 4fedfa3..7e3cdad 100644 --- a/src/pwm.cpp +++ b/src/pwm.cpp @@ -27,7 +27,6 @@ void pwmInit() { P1DIR |= BIT6; P1SEL |= BIT6; P1OUT = 0; - TACCR0 = PWM_MAX; TACCR1 = 128; TACCTL0 = CCIE;