diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-02-20 13:23:52 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-02-20 13:23:52 -0700 |
| commit | 104b8bfc9b37fda175f2cb2a1e33601fbf6f48f6 (patch) | |
| tree | 0b47c34e04f4db8bdd509699e9e5b72ed9d6c052 /src/core/ao_log_metrum.c | |
| parent | 403b95ee27782309b564855b85285c9f5f5c7068 (diff) | |
| parent | 1edf7ef8026ac4ab698a7f99671e9348d18ffd0a (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/core/ao_log_metrum.c')
| -rw-r--r-- | src/core/ao_log_metrum.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/ao_log_metrum.c b/src/core/ao_log_metrum.c index 91624d98..9b17adc2 100644 --- a/src/core/ao_log_metrum.c +++ b/src/core/ao_log_metrum.c @@ -116,7 +116,9 @@ ao_log(void) log.u.sensor.pres = ao_data_ring[ao_log_data_pos].ms5607_raw.pres; log.u.sensor.temp = ao_data_ring[ao_log_data_pos].ms5607_raw.temp; #endif +#if HAS_ACCEL log.u.sensor.accel = ao_data_accel(&ao_data_ring[ao_log_data_pos]); +#endif ao_log_metrum(&log); if (ao_log_state <= ao_flight_coast) next_sensor = log.tick + AO_SENSOR_INTERVAL_ASCENT; |