projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename states. launchpad -> pad, coast -> fast
[fw/altos]
/
src
/
ao_flight.c
diff --git
a/src/ao_flight.c
b/src/ao_flight.c
index c0f5683047b4d5e3e37dd6d28d14bb9de71295e2..6de6e7cc324620c0f6b82c3ae317d61d5f6ceb45 100644
(file)
--- a/
src/ao_flight.c
+++ b/
src/ao_flight.c
@@
-216,7
+216,7
@@
ao_flight(void)
ao_old_vel = ao_flight_vel;
ao_old_vel_tick = ao_flight_tick;
ao_old_vel = ao_flight_vel;
ao_old_vel_tick = ao_flight_tick;
- /* Go to
launch
pad state if the nose is pointing up */
+ /* Go to pad state if the nose is pointing up */
ao_config_get();
if (ao_flight_accel < ao_config.accel_zero_g - ACCEL_NOSE_UP) {
ao_config_get();
if (ao_flight_accel < ao_config.accel_zero_g - ACCEL_NOSE_UP) {
@@
-229,7
+229,7
@@
ao_flight(void)
*/
ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_PAD);
*/
ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_PAD);
- ao_flight_state = ao_flight_
launch
pad;
+ ao_flight_state = ao_flight_pad;
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
} else {
ao_flight_state = ao_flight_idle;
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
} else {
ao_flight_state = ao_flight_idle;
@@
-242,7
+242,7
@@
ao_flight(void)
/* signal successful initialization by turning off the LED */
ao_led_off(AO_LED_RED);
break;
/* signal successful initialization by turning off the LED */
ao_led_off(AO_LED_RED);
break;
- case ao_flight_
launch
pad:
+ case ao_flight_pad:
/* Trim velocity
*
/* Trim velocity
*
@@
-283,7
+283,7
@@
ao_flight(void)
break;
case ao_flight_boost:
break;
case ao_flight_boost:
- /* boost to
co
ast:
+ /* boost to
f
ast:
*
* accelerometer: start to fall at > 1/4 G
* OR
*
* accelerometer: start to fall at > 1/4 G
* OR
@@
-296,14
+296,14
@@
ao_flight(void)
if (ao_flight_accel > ao_ground_accel + (ACCEL_G >> 2) ||
(int16_t) (ao_flight_tick - ao_launch_tick) > BOOST_TICKS_MAX)
{
if (ao_flight_accel > ao_ground_accel + (ACCEL_G >> 2) ||
(int16_t) (ao_flight_tick - ao_launch_tick) > BOOST_TICKS_MAX)
{
- ao_flight_state = ao_flight_
co
ast;
+ ao_flight_state = ao_flight_
f
ast;
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
break;
}
break;
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
break;
}
break;
- case ao_flight_
co
ast:
+ case ao_flight_
f
ast:
- /*
coast to apogee detec
t:
+ /*
fast to coas
t:
*
* accelerometer: integrated velocity < 200 m/s
* OR
*
* accelerometer: integrated velocity < 200 m/s
* OR