diff options
| author | Keith Packard <keithp@keithp.com> | 2012-10-21 17:26:16 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-10-21 17:26:16 -0700 |
| commit | e16c33545640f745cec8dc595b2343359efced57 (patch) | |
| tree | c40e0936dea751ba0292651cd671c00312f114c6 /src/test/ao_flight_test.c | |
| parent | f789b0b94eb01e3875f7711ce053658c31e75fad (diff) | |
altos/test: Use MMA655X in ao_flight_test_mm. Add run-mm to plot mm data
Pull MMA655X data out of eeprom file when available. Switch build to
using MMA655x by default.
Clone run-one to plot a single mm flight
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/test/ao_flight_test.c')
| -rw-r--r-- | src/test/ao_flight_test.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c index 0df9a5d7..7180f02d 100644 --- a/src/test/ao_flight_test.c +++ b/src/test/ao_flight_test.c @@ -39,7 +39,7 @@ #define AO_ADC_NUM_SENSE 6 #define HAS_MS5607 1 #define HAS_MPU6000 1 -#define HAS_MMA655X 0 +#define HAS_MMA655X 1 struct ao_adc { int16_t sense[AO_ADC_NUM_SENSE]; @@ -622,6 +622,9 @@ ao_sleep(void *wchan) ao_data_static.mpu6000.gyro_x = int16(bytes, 14); ao_data_static.mpu6000.gyro_y = -int16(bytes, 16); ao_data_static.mpu6000.gyro_z = int16(bytes, 18); +#if HAS_MMA655X + ao_data_static.mma655x = int16(bytes, 26); +#endif if (ao_records_read == 0) ao_ground_mpu6000 = ao_data_static.mpu6000; else if (ao_records_read < 10) { |