projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make balloon code run again
[fw/altos]
/
src
/
core
/
ao_balloon.c
diff --git
a/src/core/ao_balloon.c
b/src/core/ao_balloon.c
index 12752d1f8d3655f252ba2ba62dc6c29b63d99802..904a9c084660ac83df8d8ad15c447c9f3742fa41 100644
(file)
--- a/
src/core/ao_balloon.c
+++ b/
src/core/ao_balloon.c
@@
-31,6
+31,13
@@
#error Please define HAS_USB
#endif
#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 */
/* 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
*/
/* 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 */
#endif
/* Disable packet mode in pad state */
@@
-112,9
+120,8
@@
ao_flight(void)
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
}
break;
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
}
break;
-
case ao_flight_drogue
:
+
default
:
break;
break;
-
}
}
}
}
}
}