summaryrefslogtreecommitdiff
path: root/ao-tools/lib
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-02-07 00:25:22 -0800
committerKeith Packard <keithp@keithp.com>2010-02-11 21:23:35 -0800
commitc83615567b4567f3dc45a7f7b894943b45fbb65c (patch)
treef5c905acf9d581500285c88a890e3b4ad5d643f8 /ao-tools/lib
parentf8967607b3dda0c0ce7afe8bb077da2da5ed3dcd (diff)
Pull in a bit more data for filtering the start of the boost
Diffstat (limited to 'ao-tools/lib')
-rw-r--r--ao-tools/lib/cc-process.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ao-tools/lib/cc-process.c b/ao-tools/lib/cc-process.c
index 5c1acc6b..c756b570 100644
--- a/ao-tools/lib/cc-process.c
+++ b/ao-tools/lib/cc-process.c
@@ -70,7 +70,7 @@ cc_flight_cook(struct cc_flightraw *raw)
*/
for (i = 0; i < raw->state.num; i++) {
if (!start_set && raw->state.data[i].value > ao_flight_pad) {
- flight_start = raw->state.data[i].time;
+ flight_start = raw->state.data[i].time - 10;
start_set = 1;
}
if (!stop_set && raw->state.data[i].value > ao_flight_main) {
@@ -79,7 +79,7 @@ cc_flight_cook(struct cc_flightraw *raw)
}
}
- if (!start_set)
+ if (!start_set || flight_start < raw->accel.data[0].time)
flight_start = raw->accel.data[0].time;
if (stop_set) {
for (i = 0; i < raw->accel.num - 1; i++) {
@@ -101,8 +101,8 @@ cc_flight_cook(struct cc_flightraw *raw)
accel_speed = cc_timedata_integrate(&cooked->accel, flight_start - 10, flight_stop);
accel_pos = cc_timedata_integrate(accel_speed, flight_start - 10, flight_stop);
-#define ACCEL_OMEGA_PASS (2 * M_PI * 5 / 100)
-#define ACCEL_OMEGA_STOP (2 * M_PI * 8 / 100)
+#define ACCEL_OMEGA_PASS (2 * M_PI * 20 / 100)
+#define ACCEL_OMEGA_STOP (2 * M_PI * 30 / 100)
#define BARO_OMEGA_PASS (2 * M_PI * .5 / 100)
#define BARO_OMEGA_STOP (2 * M_PI * 1 / 100)
#define FILTER_ERROR (1e-8)