summaryrefslogtreecommitdiff
path: root/src/core/ao_sample_mm.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-06-21 09:45:42 -0700
committerKeith Packard <keithp@keithp.com>2012-06-21 09:45:42 -0700
commitd2bd95edb6f77daeb1e8f043c4a239c248728e0c (patch)
tree5a9e16cc40bc2b6b7ba2daa811299f4768f40d00 /src/core/ao_sample_mm.c
parent419a801131c1034f1fa149a67850290431cbda72 (diff)
altos: Add full MM telemetry
Create two new telemetry packets to hold all of the MM data. This patch also splits the telemetry structures out of ao.h Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/core/ao_sample_mm.c')
-rw-r--r--src/core/ao_sample_mm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/ao_sample_mm.c b/src/core/ao_sample_mm.c
index 8cfadc40..ac11eef0 100644
--- a/src/core/ao_sample_mm.c
+++ b/src/core/ao_sample_mm.c
@@ -101,11 +101,14 @@ ao_sample(void)
/* Capture a sample */
ao_data = (struct ao_data *) &ao_data_ring[ao_sample_data];
ao_sample_tick = ao_data->tick;
+
+ ao_data_pres_cook(ao_data);
ao_sample_pres = ao_data_pres(ao_data);
ao_sample_alt = pres_to_altitude(ao_sample_pres);
ao_sample_height = ao_sample_alt - ao_ground_height;
+
#if HAS_ACCEL
- ao_sample_accel = ao_data_accel_sample(ao_data);
+ ao_sample_accel = ao_data_accel_cook(ao_data);
if (ao_config.pad_orientation != AO_PAD_ORIENTATION_ANTENNA_UP)
ao_sample_accel = ao_data_accel_invert(ao_sample_accel);
ao_data_set_accel(ao_data, ao_sample_accel);