summaryrefslogtreecommitdiff
path: root/altosui
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-08-31 08:19:28 -0500
committerKeith Packard <keithp@keithp.com>2013-08-31 08:19:28 -0500
commit017ed54ff69ef2f7740ea2578e22bf72e88deafb (patch)
tree3b30317b5e3d495ded06cb75c46bc9b4f8bef04f /altosui
parentf07f6d55edf5b97020680b3ce1d9e00bb3df64a6 (diff)
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>
Diffstat (limited to 'altosui')
-rw-r--r--altosui/AltosCSV.java2
-rw-r--r--altosui/AltosUI.java2
2 files changed, 2 insertions, 2 deletions
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;