Add optional 's' command to packet slave to enable/disable slave mode

[fw/altos] / src / ao_adc.c

diff --git a/src/ao_adc.c b/src/ao_adc.c
index b0bfceb1c570ffc9b48b76bbef9d20e91d02103d..50f968488ab2ebf6b06257de3d2ab408967e99b7 100644 (file)
--- a/src/ao_adc.c
+++ b/src/ao_adc.c
@@ -16,6 +16,7 @@
  */
 
 #include "ao.h"
+#include "ao_pins.h"
 
 volatile __xdata struct ao_adc ao_adc_ring[AO_ADC_RING];
 volatile __data uint8_t                ao_adc_head;
@@ -46,16 +47,20 @@ 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) {
+#if HAS_EXTERNAL_TEMP == 0
                /* start next channel conversion */
-               sequence++;
-               /* skip channel 2, we don't have a temp sensor on v0.2 */
-               if (sequence == 2)
-                       sequence++;
-               ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence;
+               /* v0.2 replaces external temp sensor with internal one */
+               if (sequence == 1)
+                       ADCCON3 = ADCCON3_EREF_1_25 | ADCCON3_EDIV_512 | ADCCON3_ECH_TEMP;
+               else
+#endif
+                       ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
        } else {
                /* record this conversion series */
                ao_adc_ring[ao_adc_head].tick = ao_time();
@@ -84,7 +89,9 @@ ao_adc_init(void)
 {
        ADCCFG = ((1 << 0) |    /* acceleration */
                  (1 << 1) |    /* pressure */
-/*               (1 << 2) |      v0.1 temperature */
+#if HAS_EXTERNAL_TEMP
+                 (1 << 2) |    /* v0.1 temperature */
+#endif
                  (1 << 3) |    /* battery voltage */
                  (1 << 4) |    /* drogue sense */
                  (1 << 5));    /* main sense */