altoslib/altosui: Fixes for state changes

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 6d5ce18512954c66a3aceee7c4c994760786e773..b47df0d9cc4844e45d94c40e94775cc24bc85fe8 100644 (file)
--- 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;
@@ -437,7 +437,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);
                }
        }
 
@@ -517,9 +517,9 @@ public class AltosUI extends AltosUIFrame {
 
        static boolean process_cat(File file) {
                try {
-                       FileInputStream input = new FileInputStream(file);
-                       AltosEepromFile eef = new AltosEepromFile(input);
+                       AltosStateIterable eef = record_iterable(file);
 
+                       System.out.printf ("process cat\n");
                        for (AltosState state : eef) {
                                if ((state.set & AltosState.set_gps) != 0)
                                        System.out.printf ("time %g lat %g lon %g alt %g\n",