X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_adc.c;h=639c5f6c3b9281f6096c3d3b7308a4c7cacf53b5;hp=f043b5a133a3d1b099e9793bcd02124ec14e9111;hb=b99315cee4ab796376458a2442cf36806fa4aed3;hpb=f3f25a1cec7d2a034aa544569cfd23bea1a996c5

diff --git a/ao_adc.c b/ao_adc.c
index f043b5a1..639c5f6c 100644
--- a/ao_adc.c
+++ b/ao_adc.c
@@ -3,8 +3,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,10 +17,30 @@
 
 #include "ao.h"
 
-volatile __xdata struct ao_adc	ao_adc_ring[ADC_RING];
+volatile __xdata struct ao_adc	ao_adc_ring[AO_ADC_RING];
 volatile __data uint8_t		ao_adc_head;
 
-void ao_adc_isr(void) interrupt 1
+void
+ao_adc_poll(void)
+{
+	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 0;
+}
+
+void
+ao_adc_sleep(void)
+{
+	ao_sleep(&ao_adc_ring);
+}
+
+void
+ao_adc_get(__xdata struct ao_adc *packet)
+{
+	uint8_t	i = ao_adc_ring_prev(ao_adc_head);
+	memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
+}
+
+void
+ao_adc_isr(void) interrupt 1
 {
 	uint8_t sequence;
 	uint8_t	__xdata *a;
@@ -35,15 +54,29 @@ void ao_adc_isr(void) interrupt 1
 		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
 	} else {
 		/* record this conversion series */
-		ao_adc_ring[ao_adc_head].tick = ao_time;
-		ao_adc_head++;
-		if (ao_adc_head == ADC_RING)
-			ao_adc_head = 0;
+		ao_adc_ring[ao_adc_head].tick = ao_time();
+		ao_adc_head = ao_adc_ring_next(ao_adc_head);
 		ao_wakeup(ao_adc_ring);
 	}
 }
 
-void ao_adc_init(void)
+static void
+ao_adc_dump(void)
+{
+	__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.sense_d >> 4, packet.sense_m >> 4);
+}
+
+__code struct ao_cmds ao_adc_cmds[] = {
+	{ 'a',	ao_adc_dump,	"a                                  Display current ADC values" },
+	{ 0,	ao_adc_dump, NULL },
+};
+
+void
+ao_adc_init(void)
 {
 	ADCCFG = ((1 << 0) |	/* acceleration */
 		  (1 << 1) |	/* pressure */
@@ -55,19 +88,6 @@ void ao_adc_init(void)
 	/* enable interrupts */
 	ADCIF = 0;
 	IEN0 |= IEN0_ADCIE;
-}
-
-void ao_adc_poll(void)
-{
-	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 0;
-}
-
-void ao_adc_get(__xdata struct ao_adc *packet)
-{
-	uint8_t	i = ao_adc_head;
-	if (i == 0)
-		i = ADC_RING;
-	i--;
-	memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
+	ao_cmd_register(&ao_adc_cmds[0]);
 }