X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_adc.c;h=bef6bb7f68e3703a2a5866f6efc383ce95e162ca;hp=39875bbda7a195bf4249c061d0b0e1979e9b044d;hb=be3f4fed7b863c8cdaabe32b61b65a8b3cd11355;hpb=43c8f7012102cdb591ace899420c10e4a78385ad

diff --git a/ao_adc.c b/ao_adc.c
index 39875bbd..bef6bb7f 100644
--- a/ao_adc.c
+++ b/ao_adc.c
@@ -35,10 +35,7 @@ ao_adc_sleep(void)
 void
 ao_adc_get(__xdata struct ao_adc *packet)
 {
-	uint8_t	i = ao_adc_head;
-	if (i == 0)
-		i = AO_ADC_RING;
-	i--;
+	uint8_t	i = ao_adc_ring_prev(ao_adc_head);
 	memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
 }
 
@@ -58,9 +55,7 @@ ao_adc_isr(void) interrupt 1
 	} else {
 		/* record this conversion series */
 		ao_adc_ring[ao_adc_head].tick = ao_time();
-		ao_adc_head++;
-		if (ao_adc_head == AO_ADC_RING)
-			ao_adc_head = 0;
+		ao_adc_head = ao_adc_ring_next(ao_adc_head);
 		ao_wakeup(ao_adc_ring);
 	}
 }
@@ -72,11 +67,11 @@ ao_adc_dump(void)
 	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);
+	       packet.v_batt >> 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\n" },
+	{ 'a',	ao_adc_dump,	"a                                  Display current ADC values" },
 	{ 0,	ao_adc_dump, NULL },
 };