diff options
| author | Keith Packard <keithp@keithp.com> | 2009-06-14 16:45:19 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-06-14 16:45:19 -0700 |
| commit | 0f2cbd41332b1b63865c5f1a4e749419b469853a (patch) | |
| tree | c0332a9093dbf686ccafa2fedd5ebd8e2d27ca29 /src | |
| parent | 5834a12c1d3d71105c9e3d1ceaf9f3ffac9ff1eb (diff) | |
Rename state apogee -> coast
Diffstat (limited to 'src')
| -rw-r--r-- | src/ao.h | 2 | ||||
| -rw-r--r-- | src/ao_flight.c | 6 | ||||
| -rw-r--r-- | src/ao_flight_test.c | 4 | ||||
| -rw-r--r-- | src/ao_report.c | 2 | ||||
| -rw-r--r-- | src/ao_state.c | 2 |
5 files changed, 8 insertions, 8 deletions
@@ -556,7 +556,7 @@ enum ao_flight_state { ao_flight_pad = 2, ao_flight_boost = 3, ao_flight_fast = 4, - ao_flight_apogee = 5, + ao_flight_coast = 5, ao_flight_drogue = 6, ao_flight_main = 7, ao_flight_landed = 8, diff --git a/src/ao_flight.c b/src/ao_flight.c index 6de6e7cc..be9b3bb6 100644 --- a/src/ao_flight.c +++ b/src/ao_flight.c @@ -325,13 +325,13 @@ ao_flight(void) * apogee detect */ ao_min_vel = abs(ao_flight_vel); - ao_flight_state = ao_flight_apogee; + ao_flight_state = ao_flight_coast; ao_wakeup(DATA_TO_XDATA(&ao_flight_state)); } break; - case ao_flight_apogee: + case ao_flight_coast: - /* apogee detect to drogue deploy: + /* apogee detect: coast to drogue deploy: * * accelerometer: abs(velocity) > min_velocity + 2m/s * OR diff --git a/src/ao_flight_test.c b/src/ao_flight_test.c index fde38dc3..1466b886 100644 --- a/src/ao_flight_test.c +++ b/src/ao_flight_test.c @@ -51,7 +51,7 @@ enum ao_flight_state { ao_flight_pad = 2, ao_flight_boost = 3, ao_flight_fast = 4, - ao_flight_apogee = 5, + ao_flight_coast = 5, ao_flight_drogue = 6, ao_flight_main = 7, ao_flight_landed = 8, @@ -106,7 +106,7 @@ ao_sleep(void *wchan); const char const * const ao_state_names[] = { "startup", "idle", "pad", "boost", "fast", - "apogee", "drogue", "main", "landed", "invalid" + "coast", "drogue", "main", "landed", "invalid" }; struct ao_cmds { diff --git a/src/ao_report.c b/src/ao_report.c index 8885ea4e..14eaf428 100644 --- a/src/ao_report.c +++ b/src/ao_report.c @@ -23,7 +23,7 @@ static const char * __xdata flight_reports[] = { ".--.", /* pad 'P' */ "-...", /* boost 'B' */ "..-.", /* fast 'F' */ - ".-", /* apogee 'A' */ + "-.-.", /* coast 'C' */ "-..", /* drogue 'D' */ "--", /* main 'M' */ ".-..", /* landed 'L' */ diff --git a/src/ao_state.c b/src/ao_state.c index c3443503..ed197aa5 100644 --- a/src/ao_state.c +++ b/src/ao_state.c @@ -19,5 +19,5 @@ const char const * const ao_state_names[] = { "startup", "idle", "pad", "boost", "fast", - "apogee", "drogue", "main", "landed", "invalid" + "coast", "drogue", "main", "landed", "invalid" }; |