altos: Make balloon code run again
authorKeith Packard <keithp@keithp.com>
Tue, 18 Feb 2014 17:46:17 +0000 (09:46 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 18 Feb 2014 17:46:17 +0000 (09:46 -0800)
This fixes the balloon code so that it works with recent altos bits

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

index 12752d1f8d3655f252ba2ba62dc6c29b63d99802..904a9c084660ac83df8d8ad15c447c9f3742fa41 100644 (file)
 #error Please define HAS_USB
 #endif
 
+#if HAS_SENSOR_ERRORS
+/* Any sensor can set this to mark the flight computer as 'broken' */
+__xdata uint8_t                        ao_sensor_errors;
+#endif
+
+__pdata uint16_t               ao_motor_number;        /* number of motors burned so far */
+
 /* Main flight thread. */
 
 __pdata enum ao_flight_state   ao_flight_state;        /* current flight state */
@@ -67,7 +74,8 @@ ao_flight(void)
                                /* Disable the USB controller in flight mode
                                 * to save power
                                 */
-                               ao_usb_disable();
+                               if (!ao_usb_running)
+                                       ao_usb_disable();
 #endif
 
                                /* Disable packet mode in pad state */
@@ -112,9 +120,8 @@ ao_flight(void)
                                ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
                        }
                        break;
-               case ao_flight_drogue:
+               default:
                        break;
-                       
                }
        }
 }