From: Keith Packard <keithp@keithp.com>
Date: Sun, 28 May 2017 21:02:11 +0000 (-0700)
Subject: altoslib: Add constants for speed/accel filtering
X-Git-Tag: 1.8~70
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=2c2eb1a15e745bb67721a1e3d84fb2fc0ce64eb1

altoslib: Add constants for speed/accel filtering

With an eye towards letting the user pick.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altoslib/AltosFlightSeries.java b/altoslib/AltosFlightSeries.java
index f8665fdf..7e643d96 100644
--- a/altoslib/AltosFlightSeries.java
+++ b/altoslib/AltosFlightSeries.java
@@ -20,6 +20,9 @@ public class AltosFlightSeries extends AltosDataListener {
 
 	public ArrayList<AltosTimeSeries> series = new ArrayList<AltosTimeSeries>();
 
+	public double	speed_filter_width = 4.0;
+	public double	accel_filter_width = 4.0;
+
 	public int[] indices() {
 		int[] indices = new int[series.size()];
 		for (int i = 0; i < indices.length; i++)
@@ -165,7 +168,7 @@ public class AltosFlightSeries extends AltosDataListener {
 
 		if (speed_series != null) {
 			AltosTimeSeries temp_series = make_series(speed_name, AltosConvert.speed);
-			speed_series.filter(temp_series, 2.0);
+			speed_series.filter(temp_series, accel_filter_width);
 			accel_series = add_series(accel_name, AltosConvert.accel);
 			temp_series.differentiate(accel_series);
 		}
@@ -236,7 +239,7 @@ public class AltosFlightSeries extends AltosDataListener {
 
 		if (altitude_series != null) {
 			AltosTimeSeries temp_series = make_series(altitude_name, AltosConvert.height);
-			altitude_series.filter(temp_series, 1.0);
+			altitude_series.filter(temp_series, speed_filter_width);
 
 			alt_speed_series = make_series(speed_name, AltosConvert.speed);
 			temp_series.differentiate(alt_speed_series);
@@ -399,13 +402,18 @@ public class AltosFlightSeries extends AltosDataListener {
 		}
 		sats_in_soln.add(time(), gps.nsat);
 		if (gps.pdop != AltosLib.MISSING) {
-			if (gps_pdop == null) {
+			if (gps_pdop == null)
 				gps_pdop = add_series(gps_pdop_name, null);
-				gps_hdop = add_series(gps_hdop_name, null);
-				gps_vdop = add_series(gps_vdop_name, null);
-			}
 			gps_pdop.add(time(), gps.pdop);
+		}
+		if (gps.hdop != AltosLib.MISSING) {
+			if (gps_hdop == null)
+				gps_hdop = add_series(gps_hdop_name, null);
 			gps_hdop.add(time(), gps.hdop);
+		}
+		if (gps.vdop != AltosLib.MISSING) {
+			if (gps_vdop == null)
+				gps_vdop = add_series(gps_vdop_name, null);
 			gps_vdop.add(time(), gps.vdop);
 		}
 		if (gps.locked) {