diff options
author | Bdale Garbee <bdale@gag.com> | 2012-12-28 22:30:26 -0700 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2012-12-28 22:30:26 -0700 |
commit | 59f355f5288b42b2e47743d06e41e55819a55f64 (patch) | |
tree | 1ef54ec06088f86455173a9069b538655b965ffa /src/core/ao_log.h | |
parent | 099d2b0ea59d825bd69a3fbb5523b9cbb9430ce8 (diff) | |
parent | b70ca5eaf1c3d60bd9adf6835e1247f4147ca9c8 (diff) |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/core/ao_log.h')
-rw-r--r-- | src/core/ao_log.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/ao_log.h b/src/core/ao_log.h index 4eaed420..036d6f2d 100644 --- a/src/core/ao_log.h +++ b/src/core/ao_log.h @@ -199,10 +199,16 @@ struct ao_log_mega { union { /* 4 */ /* AO_LOG_FLIGHT */ struct { - uint16_t flight; /* 4 */ - int16_t ground_accel; /* 6 */ - uint32_t ground_pres; /* 8 */ - } flight; /* 12 */ + uint16_t flight; /* 4 */ + int16_t ground_accel; /* 6 */ + uint32_t ground_pres; /* 8 */ + int16_t ground_accel_along; /* 16 */ + int16_t ground_accel_across; /* 12 */ + int16_t ground_accel_through; /* 14 */ + int16_t ground_roll; /* 18 */ + int16_t ground_pitch; /* 20 */ + int16_t ground_yaw; /* 22 */ + } flight; /* 24 */ /* AO_LOG_STATE */ struct { uint16_t state; |