altos: Shrink ao_cmd_put16, ao_cmd_hex and ao_cmd

[fw/altos] / src / ao_adc.c

diff --git a/src/ao_adc.c b/src/ao_adc.c
index 9990a1fdaeecf75df906339d56a0b56bcebc0685..cbeb6a24e5b13b141878fea484dfc2d77459f4a5 100644 (file)
--- a/src/ao_adc.c
+++ b/src/ao_adc.c
@@ -30,14 +30,18 @@ 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));
 }
 
@@ -48,6 +52,8 @@ ao_adc_isr(void) __interrupt 1
        uint8_t __xdata *a;
 
        sequence = (ADCCON2 & ADCCON2_SCH_MASK) >> ADCCON2_SCH_SHIFT;
+#if IGNITE_ON_P2
+       /* TeleMetrum readings */
 #if HAS_ACCEL_REF
        if (sequence == 2) {
                a = (uint8_t __xdata *) (&ao_accel_ref[ao_adc_head]);
@@ -60,6 +66,7 @@ ao_adc_isr(void) __interrupt 1
                a = (uint8_t __xdata *) (&ao_adc_ring[ao_adc_head].accel + sequence);
                sequence++;
        }
+#define GOT_ADC
        a[0] = ADCL;
        a[1] = ADCH;
        if (sequence < 6) {
@@ -71,7 +78,72 @@ ao_adc_isr(void) __interrupt 1
                else
 #endif
                        ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence;
-       } else {
+       }
+#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);
@@ -90,13 +162,15 @@ ao_adc_dump(void) __reentrant
 }
 
 __code struct ao_cmds ao_adc_cmds[] = {
-       { ao_adc_dump,  "a\0Display current ADC values" },
+       { 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
@@ -105,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;