Mercurial > templog

diff main.c @ 58:5100e0bdadad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix voltage
author Matt Johnston <matt@ucc.asn.au>
date Mon, 25 Jun 2012 01:23:34 +0800
parents 8e897a682208
children d5b269352ba0 62112fc2af21
line wrap: on
line diff
--- a/main.c	Sun Jun 24 23:48:25 2012 +0800
+++ b/main.c	Mon Jun 25 01:23:34 2012 +0800
@@ -619,7 +619,7 @@
     ADCSRA = _BV(ADEN) | _BV(ADPS2);
 
     // set to measure 1.1 reference
-    ADMUX = _BV(ADLAR) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1);
+    ADMUX = _BV(REFS0) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1);
     ADCSRA |= _BV(ADSC);
     loop_until_bit_is_clear(ADCSRA, ADSC);
     uint8_t low_11 = ADCL;
@@ -630,14 +630,15 @@
     *millivolt_vcc = 1000 * res_volts;
 
     // measure AVR internal temperature against 1.1 ref.
-    ADMUX = _BV(ADLAR) | _BV(MUX3) | _BV(REFS1) | _BV(REFS0);
+    ADMUX = _BV(MUX3) | _BV(REFS1) | _BV(REFS0);
     ADCSRA |= _BV(ADSC);
     loop_until_bit_is_clear(ADCSRA, ADSC);
-    uint16_t res_internal = ADCL;
-    res_internal |= ADCH << 8;
+    uint8_t low_temp = ADCL;
+    uint8_t high_temp = ADCH;
+    uint16_t res_internal = low_temp + (high_temp << 8);
     float internal_volts = res_internal * (1.1 / 1024.0);
-    // decidegrees
-    *int_temp = (internal_volts - 2.73) * 1000;
+    // millivolts
+    *int_temp = internal_volts * 1000;
 
     PRR |= _BV(PRADC);
     ADCSRA = 0;