From: Keith Packard <keithp@keithp.com>
Date: Sat, 31 Aug 2013 13:19:28 +0000 (-0500)
Subject: altoslib/altosui: Fixes for state changes
X-Git-Tag: 1.2.9.4~113
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=017ed54ff69ef2f7740ea2578e22bf72e88deafb

altoslib/altosui: Fixes for state changes

Format for gps alt (now double).
Use new code for csv file loading.

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

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 52650062..aa3de432 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -350,7 +350,7 @@ public class AltosState implements Cloneable {
 	}
 
 	double motion_filter_value() {
-		return 1/ Math.exp(time_change/10.0);
+		return 1/ Math.exp(time_change/2.0);
 	}
 
 	void update_speed() {
diff --git a/altosui/AltosCSV.java b/altosui/AltosCSV.java
index 0b5a74e9..c96c815e 100644
--- a/altosui/AltosCSV.java
+++ b/altosui/AltosCSV.java
@@ -170,7 +170,7 @@ public class AltosCSV implements AltosWriter {
 		if (from_pad == null)
 			from_pad = new AltosGreatCircle();
 
-		out.printf("%2d,%2d,%3d,%12.7f,%12.7f,%6d,%5d,%3d,%3d,%3d,%3d,%3d,%9.0f,%9.0f,%4.0f,%4.0f,%6.1f",
+		out.printf("%2d,%2d,%3d,%12.7f,%12.7f,%8.1f,%5d,%3d,%3d,%3d,%3d,%3d,%9.0f,%9.0f,%4.0f,%4.0f,%6.1f",
 			   gps.connected?1:0,
 			   gps.locked?1:0,
 			   gps.nsat,
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 72b2c0d9..b47df0d9 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -353,7 +353,7 @@ public class AltosUI extends AltosUIFrame {
 			if (file.getName().endsWith("eeprom"))
 				return new AltosEepromFile(in);
 			else
-				return null; // new AltosTelemetryIterable(in);
+				return new AltosTelemetryFile(in);
 		} catch (FileNotFoundException fe) {
 			System.out.printf("%s\n", fe.getMessage());
 			return null;