summaryrefslogtreecommitdiff
path: root/src/stm/ao_adc_stm.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-05-27 16:46:00 -0600
committerKeith Packard <keithp@keithp.com>2012-05-27 16:46:00 -0600
commit9eeba439ce8c9dc1def8528f96b6a67c6578d656 (patch)
tree49ef7074be77e56e80e01dcb3674cde2e0dc7ec9 /src/stm/ao_adc_stm.c
parentd01c10eff4b70af13347969a7cece8730cf1a3f1 (diff)
altos: Don't start ADC ring until the other sensors have a valid value
Yes, this is still an ugly kludge, but it's easy. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/stm/ao_adc_stm.c')
-rw-r--r--src/stm/ao_adc_stm.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/stm/ao_adc_stm.c b/src/stm/ao_adc_stm.c
index 576dbf5d..02187205 100644
--- a/src/stm/ao_adc_stm.c
+++ b/src/stm/ao_adc_stm.c
@@ -50,15 +50,22 @@ static uint8_t ao_adc_ready;
*/
static void ao_adc_done(int index)
{
+ uint8_t step = 1;
ao_data_ring[ao_data_head].tick = ao_time();
#if HAS_MPU6000
+ if (!ao_mpu6000_valid)
+ step = 0;
ao_data_ring[ao_data_head].mpu6000 = ao_mpu6000_current;
#endif
#if HAS_MS5607
+ if (!ao_ms5607_valid)
+ step = 0;
ao_data_ring[ao_data_head].ms5607 = ao_ms5607_current;
#endif
- ao_data_head = ao_data_ring_next(ao_data_head);
- ao_wakeup((void *) &ao_data_head);
+ if (step) {
+ ao_data_head = ao_data_ring_next(ao_data_head);
+ ao_wakeup((void *) &ao_data_head);
+ }
ao_dma_done_transfer(STM_DMA_INDEX(STM_DMA_CHANNEL_ADC1));
ao_adc_ready = 1;
}