diff options
| author | Keith Packard <keithp@keithp.com> | 2014-02-18 09:46:17 -0800 | 
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-02-18 09:46:17 -0800 | 
| commit | ff4ae350c24b3d6ef71e29191bb719b07ab9c5bb (patch) | |
| tree | 523cc82124769a2f9ef8d0e3410a2b97c929d417 | |
| parent | 8b6f051663dd17492bece9efb9e898ef113ab414 (diff) | |
altos: Make balloon code run again
This fixes the balloon code so that it works with recent altos bits
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | src/core/ao_balloon.c | 13 | 
1 files changed, 10 insertions, 3 deletions
| diff --git a/src/core/ao_balloon.c b/src/core/ao_balloon.c index 12752d1f..904a9c08 100644 --- a/src/core/ao_balloon.c +++ b/src/core/ao_balloon.c @@ -31,6 +31,13 @@  #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; -			  		}  	}  } | 
