diff options
| author | Keith Packard <keithp@keithp.com> | 2012-12-25 14:20:42 -0800 | 
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-12-25 14:20:42 -0800 | 
| commit | 868ef0c9c4b208c02a87180b0eede329369bdc77 (patch) | |
| tree | 1f20d312d56bac34bad12f287629a2651bbbccf8 /src/core/ao_log.h | |
| parent | 669cde8a87d88ceae89e369c1d38b88c9f8198cf (diff) | |
| parent | 57487e78b90465a21c87cf30deb0aeaba0887332 (diff) | |
Merge branch 'master' into micropeak-logging
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; | 
