X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_adc.c;h=9990a1fdaeecf75df906339d56a0b56bcebc0685;hb=1e56ed44e562f808addfd76bfb352f981db94094;hp=b0bfceb1c570ffc9b48b76bbef9d20e91d02103d;hpb=a0d4c1b06d27e850d233f8ddf8fe32912bf0ec8f;p=fw%2Faltos

diff --git a/src/ao_adc.c b/src/ao_adc.c
index b0bfceb1..9990a1fd 100644
--- a/src/ao_adc.c
+++ b/src/ao_adc.c
@@ -16,51 +16,66 @@
  */
 
 #include "ao.h"
+#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
 	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 0;
-}
-
-void
-ao_adc_sleep(void)
-{
-	ao_sleep(&ao_adc_ring);
+#endif
 }
 
 void
 ao_adc_get(__xdata struct ao_adc *packet)
 {
-	uint8_t	i = ao_adc_ring_prev(ao_adc_head);
+	uint8_t	i = ao_adc_ring_prev(ao_flight_adc);
 	memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
 }
 
 void
-ao_adc_isr(void) interrupt 1
+ao_adc_isr(void) __interrupt 1
 {
 	uint8_t sequence;
 	uint8_t	__xdata *a;
 
 	sequence = (ADCCON2 & ADCCON2_SCH_MASK) >> ADCCON2_SCH_SHIFT;
-	a = (uint8_t __xdata *) (&ao_adc_ring[ao_adc_head].accel + sequence);
+#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++;
+	}
 	a[0] = ADCL;
 	a[1] = ADCH;
-	if (sequence < 5) {
+	if (sequence < 6) {
+#if HAS_EXTERNAL_TEMP == 0
 		/* start next channel conversion */
-		sequence++;
-		/* skip channel 2, we don't have a temp sensor on v0.2 */
+		/* v0.2 replaces external temp sensor with internal one */
 		if (sequence == 2)
-			sequence++;
-		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence;
+			ADCCON3 = ADCCON3_EREF_1_25 | ADCCON3_EDIV_512 | ADCCON3_ECH_TEMP;
+		else
+#endif
+			ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence;
 	} else {
 		/* record this conversion series */
 		ao_adc_ring[ao_adc_head].tick = ao_time();
 		ao_adc_head = ao_adc_ring_next(ao_adc_head);
-		ao_wakeup(ao_adc_ring);
+		ao_wakeup(DATA_TO_XDATA(&ao_adc_head));
 	}
 }
 
@@ -75,8 +90,8 @@ 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\0Display current ADC values" },
+	{ 0, NULL },
 };
 
 void
@@ -84,7 +99,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 */