Switch to using internal cc1111 temperature sensor

[fw/altos] / src / ao_adc.c

diff --git a/src/ao_adc.c b/src/ao_adc.c
index d96726716fdf568d6cbc8a6378f3dc2aea6314d1..2b972e6cd087d041e67d9c81cfb2383f065efa56 100644 (file)
--- a/src/ao_adc.c
+++ b/src/ao_adc.c
@@ -46,12 +46,18 @@ ao_adc_isr(void) interrupt 1
        uint8_t __xdata *a;
 
        sequence = (ADCCON2 & ADCCON2_SCH_MASK) >> ADCCON2_SCH_SHIFT;
+       if (sequence == ADCCON3_ECH_TEMP)
+               sequence = 2;
        a = (uint8_t __xdata *) (&ao_adc_ring[ao_adc_head].accel + sequence);
        a[0] = ADCL;
        a[1] = ADCH;
        if (sequence < 5) {
                /* start next channel conversion */
-               ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
+               /* v0.2 replaces external temp sensor with internal one */
+               if (sequence == 1)
+                       ADCCON3 = ADCCON3_EREF_1_25 | ADCCON3_EDIV_512 | ADCCON3_ECH_TEMP;
+               else
+                       ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
        } else {
                /* record this conversion series */
                ao_adc_ring[ao_adc_head].tick = ao_time();
@@ -65,9 +71,9 @@ ao_adc_dump(void) __reentrant
 {
        static __xdata struct ao_adc    packet;
        ao_adc_get(&packet);
-       printf("tick: %5u accel: %4d pres: %4d temp: %4d batt: %4d drogue: %4d main: %4d\n",
-              packet.tick, packet.accel >> 4, packet.pres >> 4, packet.temp >> 4,
-              packet.v_batt >> 4, packet.sense_d >> 4, packet.sense_m >> 4);
+       printf("tick: %5u accel: %5d pres: %5d temp: %5d batt: %5d drogue: %5d main: %5d\n",
+              packet.tick, packet.accel, packet.pres, packet.temp,
+              packet.v_batt, packet.sense_d, packet.sense_m);
 }
 
 __code struct ao_cmds ao_adc_cmds[] = {
@@ -80,7 +86,7 @@ ao_adc_init(void)
 {
        ADCCFG = ((1 << 0) |    /* acceleration */
                  (1 << 1) |    /* pressure */
-                 (1 << 2) |    /* temperature */
+/*               (1 << 2) |      v0.1 temperature */
                  (1 << 3) |    /* battery voltage */
                  (1 << 4) |    /* drogue sense */
                  (1 << 5));    /* main sense */