altos: mma655x also needs ao_sensor_errors
authorKeith Packard <keithp@keithp.com>
Sat, 21 Dec 2013 06:13:32 +0000 (22:13 -0800)
committerKeith Packard <keithp@keithp.com>
Sat, 21 Dec 2013 06:19:35 +0000 (22:19 -0800)
TeleMetrum has an MMA655X but no IMU, so it needs an explicit addition
for sensor errors.

Signed-off-by: Keith Packard <keithp@keithp.com>
src/core/ao_flight.c
src/core/ao_flight.h

index 5918b997e6250eefb84bee7f26d8fd057760ae85..aac6880db1260d6dea90a4ce47cd5319e6e1d0f4 100644 (file)
@@ -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
index c7c02ccf69cc4166e0549513d5d1b02971a4c078..01d21c119538701bccb08de33df65c93180e9ae1 100644 (file)
@@ -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