projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Remove redundant initialization of ao_interval variables
[fw/altos]
/
src
/
ao_flight.c
diff --git
a/src/ao_flight.c
b/src/ao_flight.c
index e0fd97f2464b901a61649037e61a9848e46b819e..7fe85cb1522ac786579b824cd714c97dc088d9f3 100644
(file)
--- a/
src/ao_flight.c
+++ b/
src/ao_flight.c
@@
-84,9
+84,6
@@
__xdata uint8_t ao_flight_force_idle;
#define ACCEL_VEL_MACH VEL_MPS_TO_COUNT(200)
#define ACCEL_VEL_BOOST VEL_MPS_TO_COUNT(5)
#define ACCEL_VEL_MACH VEL_MPS_TO_COUNT(200)
#define ACCEL_VEL_BOOST VEL_MPS_TO_COUNT(5)
-int32_t accel_vel_mach;
-int32_t accel_vel_boost;
-
/*
* Barometer calibration
*
/*
* Barometer calibration
*
@@
-214,8
+211,6
@@
ao_flight(void)
ao_config_get();
ao_main_pres = ao_altitude_to_pres(ao_pres_to_altitude(ao_ground_pres) + ao_config.main_deploy);
ao_accel_2g = ao_config.accel_minus_g - ao_config.accel_plus_g;
ao_config_get();
ao_main_pres = ao_altitude_to_pres(ao_pres_to_altitude(ao_ground_pres) + ao_config.main_deploy);
ao_accel_2g = ao_config.accel_minus_g - ao_config.accel_plus_g;
- accel_vel_mach = ACCEL_VEL_MACH;
- accel_vel_boost = ACCEL_VEL_BOOST;
ao_flight_vel = 0;
ao_min_vel = 0;
ao_old_vel = ao_flight_vel;
ao_flight_vel = 0;
ao_min_vel = 0;
ao_old_vel = ao_flight_vel;
@@
-289,6
+284,10
@@
ao_flight(void)
/* disable RDF beacon */
ao_rdf_set(0);
/* disable RDF beacon */
ao_rdf_set(0);
+ /* Record current GPS position by waking up GPS log tasks */
+ ao_wakeup(&ao_gps_data);
+ ao_wakeup(&ao_gps_tracking_data);
+
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
break;
}
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
break;
}
@@
-464,11
+463,5
@@
void
ao_flight_init(void)
{
ao_flight_state = ao_flight_startup;
ao_flight_init(void)
{
ao_flight_state = ao_flight_startup;
- ao_interval_min_accel = 0;
- ao_interval_max_accel = 0x7fff;
- ao_interval_min_pres = 0;
- ao_interval_max_pres = 0x7fff;
- ao_interval_end = AO_INTERVAL_TICKS;
-
ao_add_task(&flight_task, ao_flight, "flight");
}
ao_add_task(&flight_task, ao_flight, "flight");
}