diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-20 22:13:32 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-12-20 22:19:35 -0800 |
| commit | 755082d36231c1b247bc0e1f13919dd9b5c362a8 (patch) | |
| tree | db69327dcda4706fd67e07a94104fba156e7d95b /src | |
| parent | 758acb92cccbe4b64a35a1883b42713738c90630 (diff) | |
altos: mma655x also needs ao_sensor_errors
TeleMetrum has an MMA655X but no IMU, so it needs an explicit addition
for sensor errors.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ao_flight.c | 4 | ||||
| -rw-r--r-- | src/core/ao_flight.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/core/ao_flight.c b/src/core/ao_flight.c index 5918b997..aac6880d 100644 --- a/src/core/ao_flight.c +++ b/src/core/ao_flight.c @@ -46,7 +46,7 @@ __pdata enum ao_flight_state ao_flight_state; /* current flight state */ __pdata uint16_t ao_boost_tick; /* time of launch detect */ __pdata uint16_t ao_motor_number; /* number of motors burned so far */ -#if HAS_IMU +#if HAS_SENSOR_ERRORS /* Any sensor can set this to mark the flight computer as 'broken' */ __xdata uint8_t ao_sensor_errors; #endif @@ -150,7 +150,7 @@ ao_flight(void) } else { /* Set idle mode */ ao_flight_state = ao_flight_idle; -#if HAS_IMU +#if HAS_SENSOR_ERRORS if (ao_sensor_errors) ao_flight_state = ao_flight_invalid; #endif diff --git a/src/core/ao_flight.h b/src/core/ao_flight.h index c7c02ccf..01d21c11 100644 --- a/src/core/ao_flight.h +++ b/src/core/ao_flight.h @@ -41,7 +41,11 @@ extern __pdata enum ao_flight_state ao_flight_state; extern __pdata uint16_t ao_boost_tick; extern __pdata uint16_t ao_motor_number; -#if HAS_IMU +#if HAS_IMU || HAS_MMA655X +#define HAS_SENSOR_ERRORS 1 +#endif + +#if HAS_SENSOR_ERRORS extern __xdata uint8_t ao_sensor_errors; #endif |