From: Keith Packard <keithp@keithp.com>
Date: Sun, 27 May 2012 22:44:38 +0000 (-0600)
Subject: altos: Data packet tick count does not live in adc structure
X-Git-Tag: 1.0.9.5~18
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=d01c10eff4b70af13347969a7cece8730cf1a3f1

altos: Data packet tick count does not live in adc structure

It was moved to the global structure. Having two is confusing.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/megametrum-v0.1/ao_pins.h b/src/megametrum-v0.1/ao_pins.h
index 3ab7e15a..2ae3cea8 100644
--- a/src/megametrum-v0.1/ao_pins.h
+++ b/src/megametrum-v0.1/ao_pins.h
@@ -103,7 +103,6 @@
 #define AO_ADC_NUM_SENSE	6
 
 struct ao_adc {
-	uint16_t		tick;
 	int16_t			sense[AO_ADC_NUM_SENSE];
 	int16_t			v_batt;
 	int16_t			v_pbatt;
diff --git a/src/stm/ao_adc_stm.c b/src/stm/ao_adc_stm.c
index af2968d6..576dbf5d 100644
--- a/src/stm/ao_adc_stm.c
+++ b/src/stm/ao_adc_stm.c
@@ -50,7 +50,7 @@ static uint8_t			ao_adc_ready;
  */
 static void ao_adc_done(int index)
 {
-	ao_data_ring[ao_data_head].adc.tick = ao_time();
+	ao_data_ring[ao_data_head].tick = ao_time();
 #if HAS_MPU6000
 	ao_data_ring[ao_data_head].mpu6000 = ao_mpu6000_current;
 #endif