altos: Shrink ao_config_callsign_set

[fw/altos] / src / ao_adc.c

diff --git a/src/ao_adc.c b/src/ao_adc.c
index f577b4582afe02ca838500b2d3d9e5e344612835..cbeb6a24e5b13b141878fea484dfc2d77459f4a5 100644 (file)
--- a/src/ao_adc.c
+++ b/src/ao_adc.c
@@ -19,18 +19,29 @@
 #include "ao_pins.h"
 
 volatile __xdata struct ao_adc ao_adc_ring[AO_ADC_RING];
+#if HAS_ACCEL_REF
+volatile __xdata uint16_t      ao_accel_ref[AO_ADC_RING];
+#endif
 volatile __data uint8_t                ao_adc_head;
 
 void
 ao_adc_poll(void)
 {
+#if HAS_ACCEL_REF
+       ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 2;
+#else
+# ifdef TELENANO_V_0_1
+       ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 1;
+# else
        ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 0;
+# endif
+#endif
 }
 
 void
 ao_adc_get(__xdata struct ao_adc *packet)
 {
-       uint8_t i = ao_adc_ring_prev(ao_flight_adc);
+       uint8_t i = ao_adc_ring_prev(ao_sample_adc);
        memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
 }
 
@@ -41,21 +52,98 @@ 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);
+#if IGNITE_ON_P2
+       /* TeleMetrum readings */
+#if HAS_ACCEL_REF
+       if (sequence == 2) {
+               a = (uint8_t __xdata *) (&ao_accel_ref[ao_adc_head]);
+               sequence = 0;
+       } else
+#endif
+       {
+               if (sequence == ADCCON3_ECH_TEMP)
+                       sequence = 2;
+               a = (uint8_t __xdata *) (&ao_adc_ring[ao_adc_head].accel + sequence);
+               sequence++;
+       }
+#define GOT_ADC
        a[0] = ADCL;
        a[1] = ADCH;
-       if (sequence < 5) {
+       if (sequence < 6) {
 #if HAS_EXTERNAL_TEMP == 0
                /* start next channel conversion */
                /* v0.2 replaces external temp sensor with internal one */
-               if (sequence == 1)
+               if (sequence == 2)
                        ADCCON3 = ADCCON3_EREF_1_25 | ADCCON3_EDIV_512 | ADCCON3_ECH_TEMP;
                else
 #endif
-                       ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
-       } else {
+                       ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence;
+       }
+#endif
+
+#if IGNITE_ON_P0
+       /* TeleMini readings */
+       a = (uint8_t __xdata *) (&ao_adc_ring[ao_adc_head].pres);
+#ifdef TELEMINI_V_0_1
+       switch (sequence) {
+       case 0:
+               /* pressure */
+               a += 0;
+               sequence = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 1;
+               break;
+       case 1:
+               /* drogue sense */
+               a += 6;
+               sequence = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 2;
+               break;
+       case 2:
+               /* main sense */
+               a += 8;
+               sequence = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 3;
+               break;
+       case 3:
+               /* battery */
+               a += 4;
+               sequence = ADCCON3_EREF_1_25 | ADCCON3_EDIV_512 | ADCCON3_ECH_TEMP;
+               break;
+       case ADCCON3_ECH_TEMP:
+               a += 2;
+               sequence = 0;
+               break;
+       }
+#define GOT_ADC
+#endif
+#ifdef TELENANO_V_0_1
+       switch (sequence) {
+       case 1:
+               /* pressure */
+               a += 0;
+               sequence = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 3;
+               break;
+       case 3:
+               /* battery */
+               a += 4;
+               sequence = ADCCON3_EREF_1_25 | ADCCON3_EDIV_512 | ADCCON3_ECH_TEMP;
+               break;
+       case ADCCON3_ECH_TEMP:
+               a += 2;
+               sequence = 0;
+               break;
+       }
+#define GOT_ADC
+#endif
+       a[0] = ADCL;
+       a[1] = ADCH;
+       if (sequence) {
+               /* Start next conversion */
+               ADCCON3 = sequence;
+       }
+#endif
+#ifndef GOT_ADC
+#error No known ADC configuration set
+#endif
+
+       else {
                /* record this conversion series */
                ao_adc_ring[ao_adc_head].tick = ao_time();
                ao_adc_head = ao_adc_ring_next(ao_adc_head);
@@ -74,13 +162,15 @@ ao_adc_dump(void) __reentrant
 }
 
 __code struct ao_cmds ao_adc_cmds[] = {
-       { 'a',  ao_adc_dump,    "a                                  Display current ADC values" },
-       { 0,    ao_adc_dump, NULL },
+       { ao_adc_dump,  "a\0Current ADC" },
+       { 0, NULL },
 };
 
 void
 ao_adc_init(void)
 {
+#if IGNITE_ON_P2
+       /* TeleMetrum configuration */
        ADCCFG = ((1 << 0) |    /* acceleration */
                  (1 << 1) |    /* pressure */
 #if HAS_EXTERNAL_TEMP
@@ -89,6 +179,15 @@ ao_adc_init(void)
                  (1 << 3) |    /* battery voltage */
                  (1 << 4) |    /* drogue sense */
                  (1 << 5));    /* main sense */
+#endif
+
+#if IGNITE_ON_P0
+       /* TeleMini configuration */
+       ADCCFG = ((1 << 0) |    /* pressure */
+                 (1 << 1) |    /* drogue sense */
+                 (1 << 2) |    /* main sense */
+                 (1 << 3));    /* battery voltage */
+#endif
 
        /* enable interrupts */
        ADCIF = 0;