diff options
| author | Keith Packard <keithp@keithp.com> | 2012-05-27 16:44:38 -0600 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-05-27 16:44:38 -0600 |
| commit | d01c10eff4b70af13347969a7cece8730cf1a3f1 (patch) | |
| tree | 3cde04da7af9a8c6d458ad733faf9411644b182f /src | |
| parent | 78423f3fc5164ea9fd428606419784c1700ad5c5 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/megametrum-v0.1/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/stm/ao_adc_stm.c | 2 |
2 files changed, 1 insertions, 2 deletions
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 |