X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_adc.c;h=3adf9b2e70277526e252770c7071dec7a400d0b1;hp=26209dcf1381904b5d68bd597db535e0ba3b7940;hb=2681a17500913cbaf3966f09380bb1d6b59e3863;hpb=17d2432a8b9c15963cd3b821f025ad33972ef477

diff --git a/src/ao_adc.c b/src/ao_adc.c
index 26209dcf..3adf9b2e 100644
--- a/src/ao_adc.c
+++ b/src/ao_adc.c
@@ -16,58 +16,77 @@
  */
 
 #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 */
-		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
+		/* v0.2 replaces external temp sensor with internal one */
+		if (sequence == 2)
+			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));
 	}
 }
 
 static void
-ao_adc_dump(void)
+ao_adc_dump(void) __reentrant
 {
-	__xdata struct ao_adc	packet;
+	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 +99,9 @@ ao_adc_init(void)
 {
 	ADCCFG = ((1 << 0) |	/* acceleration */
 		  (1 << 1) |	/* pressure */
-		  (1 << 2) |	/* temperature */
+#if HAS_EXTERNAL_TEMP
+		  (1 << 2) |	/* v0.1 temperature */
+#endif
 		  (1 << 3) |	/* battery voltage */
 		  (1 << 4) |	/* drogue sense */
 		  (1 << 5));	/* main sense */