diff options
| author | Keith Packard <keithp@keithp.com> | 2012-06-21 09:45:42 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-21 09:45:42 -0700 |
| commit | d2bd95edb6f77daeb1e8f043c4a239c248728e0c (patch) | |
| tree | 5a9e16cc40bc2b6b7ba2daa811299f4768f40d00 /src/core/ao_log_mega.c | |
| parent | 419a801131c1034f1fa149a67850290431cbda72 (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_log_mega.c')
| -rw-r--r-- | src/core/ao_log_mega.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ao_log_mega.c b/src/core/ao_log_mega.c index 68e2af49..e7c2b0d9 100644 --- a/src/core/ao_log_mega.c +++ b/src/core/ao_log_mega.c @@ -112,8 +112,8 @@ ao_log(void) log.tick = ao_data_ring[ao_log_data_pos].tick; if ((int16_t) (log.tick - next_sensor) >= 0) { log.type = AO_LOG_SENSOR; - log.u.sensor.pres = ao_data_ring[ao_log_data_pos].ms5607.pres; - log.u.sensor.temp = ao_data_ring[ao_log_data_pos].ms5607.temp; + 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; log.u.sensor.accel_x = ao_data_ring[ao_log_data_pos].mpu6000.accel_x; log.u.sensor.accel_y = ao_data_ring[ao_log_data_pos].mpu6000.accel_y; log.u.sensor.accel_z = ao_data_ring[ao_log_data_pos].mpu6000.accel_z; |