projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
automate push of updated and tagged master branch during debian/rules prebuild
[fw/altos]
/
src
/
ao_flight_test.c
diff --git
a/src/ao_flight_test.c
b/src/ao_flight_test.c
index f4731aa8718a9ef326134e379cda363f8fbfa08c..9fcb00c2412d4b3b49ece5d1c4740643ca2921c6 100644
(file)
--- a/
src/ao_flight_test.c
+++ b/
src/ao_flight_test.c
@@
-48,10
+48,10
@@
struct ao_adc {
enum ao_flight_state {
ao_flight_startup = 0,
ao_flight_idle = 1,
enum ao_flight_state {
ao_flight_startup = 0,
ao_flight_idle = 1,
- ao_flight_
launch
pad = 2,
+ ao_flight_pad = 2,
ao_flight_boost = 3,
ao_flight_boost = 3,
- ao_flight_
co
ast = 4,
- ao_flight_
apogee
= 5,
+ ao_flight_
f
ast = 4,
+ ao_flight_
coast
= 5,
ao_flight_drogue = 6,
ao_flight_main = 7,
ao_flight_landed = 8,
ao_flight_drogue = 6,
ao_flight_main = 7,
ao_flight_landed = 8,
@@
-68,6
+68,7
@@
uint8_t ao_adc_head;
#define ao_cmd_register(c)
#define ao_usb_disable()
#define ao_telemetry_set_interval(x)
#define ao_cmd_register(c)
#define ao_usb_disable()
#define ao_telemetry_set_interval(x)
+#define ao_rdf_set(rdf)
enum ao_igniter {
ao_igniter_drogue = 0,
enum ao_igniter {
ao_igniter_drogue = 0,
@@
-105,8
+106,8
@@
void
ao_sleep(void *wchan);
const char const * const ao_state_names[] = {
ao_sleep(void *wchan);
const char const * const ao_state_names[] = {
- "startup", "idle", "pad", "boost", "
co
ast",
- "
apogee
", "drogue", "main", "landed", "invalid"
+ "startup", "idle", "pad", "boost", "
f
ast",
+ "
coast
", "drogue", "main", "landed", "invalid"
};
struct ao_cmds {
};
struct ao_cmds {